Rename to final 2.0 M4 tag name

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

3928 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-M4-RC3/BUILDING b/sca-java-2.x/tags/2.0-M4/BUILDING
index 9993ef4b96..9993ef4b96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/BUILDING
+++ b/sca-java-2.x/tags/2.0-M4/BUILDING
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/CHANGES b/sca-java-2.x/tags/2.0-M4/CHANGES
index 7e4fb5eccb..7e4fb5eccb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/CHANGES
+++ b/sca-java-2.x/tags/2.0-M4/CHANGES
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/LICENSE b/sca-java-2.x/tags/2.0-M4/LICENSE
index ddd30126af..ddd30126af 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/NOTICE b/sca-java-2.x/tags/2.0-M4/NOTICE
index 0caf950bab..0caf950bab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/README b/sca-java-2.x/tags/2.0-M4/README
index 0a7459ec12..0a7459ec12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/README
+++ b/sca-java-2.x/tags/2.0-M4/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/RELEASE_NOTES b/sca-java-2.x/tags/2.0-M4/RELEASE_NOTES
index 7a75ab7cc3..7a75ab7cc3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/RELEASE_NOTES
+++ b/sca-java-2.x/tags/2.0-M4/RELEASE_NOTES
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
index 1e2a0fbb4d..1e2a0fbb4d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/pom.xml
index 4af0007bc2..4af0007bc2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
index 69c3fb5ac9..69c3fb5ac9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index 4260b840c3..4260b840c3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 8608a99897..8608a99897 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
index aacf93e66a..aacf93e66a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip-discriptor/pom.xml
index 4490392088..4490392088 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip-discriptor/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip-discriptor/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
index a672d2920d..a672d2920d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
index b5be2573dd..b5be2573dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/pom.xml
index 152c28bb5a..152c28bb5a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
index c17535e802..c17535e802 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index 175da3ca4a..175da3ca4a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 8608a99897..8608a99897 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
index af2ed294f9..af2ed294f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/pom.xml
index c08c27ef5a..c08c27ef5a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/pom.xml
index 2398aaafe1..2398aaafe1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
index 47c2f5dc10..47c2f5dc10 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
index c466a1b3f5..c466a1b3f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index 27fd12ee55..27fd12ee55 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index aa73578a36..aa73578a36 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/pom.xml
index 03c6039680..03c6039680 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index 0b47fea538..0b47fea538 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 847625fcf4..847625fcf4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/pom.xml
index e86e5d321a..e86e5d321a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 450e33afd5..450e33afd5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
index 1bf4353502..1bf4353502 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index d55a40bb11..d55a40bb11 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 7ccd63ce5d..7ccd63ce5d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
index ae84237c4a..ae84237c4a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/pom.xml
index d08c53f553..d08c53f553 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index bb3732cfce..bb3732cfce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 40896b1473..40896b1473 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/pom.xml
index 25b743a218..25b743a218 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index c132fa0364..c132fa0364 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
index 7794570626..7794570626 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 48c34e55a6..48c34e55a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index df80303778..df80303778 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index 47501efb9a..47501efb9a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index a90973d6f7..a90973d6f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 9729ca6823..9729ca6823 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/manifests/axiom-api-1.2.7.MF b/sca-java-2.x/tags/2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF
index 400fdc58e8..400fdc58e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/manifests/axiom-api-1.2.7.MF
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/manifests/axiom-api-1.2.7.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/manifests/woden-impl-dom-1.0M8.MF b/sca-java-2.x/tags/2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF
index b3e9d79d28..b3e9d79d28 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/manifests/woden-impl-dom-1.0M8.MF
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/manifests/woden-impl-dom-1.0M8.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/pom.xml
index 94023a4851..94023a4851 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/assembly/bin.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/assembly/bin.xml
index 51033a5e1d..51033a5e1d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/assembly/bin.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/assembly/bin.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/assembly/src.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/assembly/src.xml
index 0bb6503560..0bb6503560 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/assembly/src.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/assembly/src.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-common.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-common.xml
index b5b7111096..b5b7111096 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-common.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-common.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-launcher.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-launcher.xml
index 018e041d38..018e041d38 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-launcher.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-launcher.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-modules.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-modules.xml
index 89de329d86..89de329d86 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-modules.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-modules.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-samples.xml b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-samples.xml
index 9c0d6fdca1..9c0d6fdca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/components/bin-samples.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/INSTALL b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/INSTALL
index a1e3562d8b..a1e3562d8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/INSTALL
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/LICENSE
index f0190081ec..f0190081ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/NOTICE b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/NOTICE
index cabd225df1..cabd225df1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/bin/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/README b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/README
index d651dfdeb7..d651dfdeb7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/README
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/default.config b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/default.config
index d0f68de133..d0f68de133 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/default.config
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/default.config
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/osgi.config b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/osgi.config
index 9516b9db34..9516b9db34 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/osgi.config
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/osgi.config
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/tuscany.bat b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat
index cbf6962218..cbf6962218 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/tuscany.bat
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/tuscany.bat
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/tuscany.sh b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh
index b053afe4e1..b053afe4e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/tuscany.sh
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/tuscany.sh
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/unmanaged.config b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config
index ac99590ce9..ac99590ce9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/all/src/main/release/launcher/unmanaged.config
+++ b/sca-java-2.x/tags/2.0-M4/distribution/all/src/main/release/launcher/unmanaged.config
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/pom.xml
index 9028e497b2..9028e497b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/README.txt b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/README.txt
index b6158e3667..b6158e3667 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/README.txt
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/README.txt
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/pom.xml
index 960805ecbf..960805ecbf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/download-tomcat/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml
index 7de867b27b..7de867b27b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/download-tomcat/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/download-tomcat/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
index 1e6de85863..1e6de85863 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
index 8c67e05aa7..8c67e05aa7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
index c03a70c58a..c03a70c58a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
index d520375993..d520375993 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
index 74920f6823..74920f6823 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
index c9c6ff66d6..c9c6ff66d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
index 65e95f275c..65e95f275c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
index 9bdfd4e58b..9bdfd4e58b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
index 2d6ce9419b..2d6ce9419b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml
index 453e9063e5..453e9063e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/legal-checks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/legal-checks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 05f16f603d..05f16f603d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/pom.xml
index 47cf0ed2d6..47cf0ed2d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/testing/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/testing/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/LICENSE b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
index 70e18a0c9a..70e18a0c9a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/NOTICE b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/NOTICE
index f5792022fd..f5792022fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/pom.xml
index a851e3e9ff..a851e3e9ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
index 75f925fec5..75f925fec5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
index 5e9b5d90e5..5e9b5d90e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
index 0b0e3e7d0d..0b0e3e7d0d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml
index 06f8cd5e19..06f8cd5e19 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java
index 972aafd8b6..972aafd8b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/tomcat/foo/TuscanyTomcatNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
index 2251a2e833..2251a2e833 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
index a7e5c7e3d7..a7e5c7e3d7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/pom.xml
index fc4744ffff..fc4744ffff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
index 2f1c6bc4d8..2f1c6bc4d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
index 4e1a6a5bf0..4e1a6a5bf0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
index 77d1c46d12..77d1c46d12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
index e6c3d23e9e..e6c3d23e9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
index a6c3e4acaa..a6c3e4acaa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
+++ b/sca-java-2.x/tags/2.0-M4/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/all/pom.xml b/sca-java-2.x/tags/2.0-M4/features/all/pom.xml
index 7f70163362..7f70163362 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/all/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/all/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/api/pom.xml b/sca-java-2.x/tags/2.0-M4/features/api/pom.xml
index dbfc74b318..dbfc74b318 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/core/pom.xml b/sca-java-2.x/tags/2.0-M4/features/core/pom.xml
index 8a9256d7b2..8a9256d7b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/core/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/core/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/ejava/pom.xml b/sca-java-2.x/tags/2.0-M4/features/ejava/pom.xml
index 4dd43edce3..4dd43edce3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/ejava/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/ejava/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/pom.xml b/sca-java-2.x/tags/2.0-M4/features/pom.xml
index 8969ebfea8..8969ebfea8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/process/pom.xml b/sca-java-2.x/tags/2.0-M4/features/process/pom.xml
index d8c4e67c66..d8c4e67c66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/process/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/process/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/web20/pom.xml b/sca-java-2.x/tags/2.0-M4/features/web20/pom.xml
index 90b89e7a7a..90b89e7a7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/web20/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/web20/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/webapp/pom.xml b/sca-java-2.x/tags/2.0-M4/features/webapp/pom.xml
index 3403b97cf3..3403b97cf3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/features/webservice/pom.xml b/sca-java-2.x/tags/2.0-M4/features/webservice/pom.xml
index 4d3094e83c..4d3094e83c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/features/webservice/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/features/webservice/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/pom.xml
index 44924206e0..44924206e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index d7dff093f9..d7dff093f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 5ecf5494be..5ecf5494be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 24ab0a4181..24ab0a4181 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index f46893481b..f46893481b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index a687534bb2..a687534bb2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index a9268ac1b5..a9268ac1b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index faa10b90ca..faa10b90ca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index b976a53970..b976a53970 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index c0317687df..c0317687df 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 590f05ee84..590f05ee84 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 541a713112..541a713112 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/pom.xml
index 1403e2dd0e..1403e2dd0e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 315591fb98..315591fb98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f42325910d..f42325910d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/pom.xml
index 5e00bd0d5f..5e00bd0d5f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 86e6e4e9c5..86e6e4e9c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 156e32e9ee..156e32e9ee 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index 832c8f3702..832c8f3702 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index c77318e8fd..c77318e8fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/bpel/pom.xml
index bdd7788a37..bdd7788a37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/pom.xml
index 04d9fd64e0..04d9fd64e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index d8cb23bbd3..d8cb23bbd3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/scenario1.composite
index 4e58cdfa16..4e58cdfa16 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 06b273c7a7..06b273c7a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index ac01b3c687..ac01b3c687 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/scenario10.composite
index 2d127a7bec..2d127a7bec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 98103e360e..98103e360e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index 8b82b43c68..8b82b43c68 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/scenario11.composite
index 2f5ca96d07..2f5ca96d07 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 381ccddcc3..381ccddcc3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 4028098023..4028098023 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..23799f8487 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2b4f88dc3..a2b4f88dc3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index 1da59d5f04..1da59d5f04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/scenario13.composite
index 631e38855f..631e38855f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 98976dc4e8..98976dc4e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index b1d01afafb..b1d01afafb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/scenario2.composite
index 7672595959..7672595959 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/scenario2a.composite
index 2fe3592d12..2fe3592d12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index 22950dfe03..22950dfe03 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/scenario3.composite
index 84f42c60fc..84f42c60fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/scenario3a.composite
index 18ed91142c..18ed91142c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index a17e27c9d8..a17e27c9d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/scenario4.composite
index a0bdb0197d..a0bdb0197d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 1b4cf27c76..1b4cf27c76 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 83a232db6e..83a232db6e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenario5.composite
index 2326afd2f2..2326afd2f2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenario5a.composite
index fdf1423b66..fdf1423b66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 776dfe4d97..776dfe4d97 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenario6.composite
index 9575612d51..9575612d51 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 9c7b58e2cb..9c7b58e2cb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index ede31d6bee..ede31d6bee 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenario7.composite
index e1d2e0cefe..e1d2e0cefe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenario7a.composite
index ef16dc0785..ef16dc0785 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7bb9e694a3..7bb9e694a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenario8.composite
index 467b7f57fa..467b7f57fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 9d9b5ba945..9d9b5ba945 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index b6ec160506..b6ec160506 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/scenario9.composite
index 83584ed482..83584ed482 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 0021ec242b..0021ec242b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/tags/2.0-M4/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 27768f3799..27768f3799 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-api/pom.xml
index 212bf0f572..212bf0f572 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 309311e258..309311e258 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 55736e5254..55736e5254 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/pom.xml
index 4be520aabd..4be520aabd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index db1a2fbf6a..db1a2fbf6a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/pom.xml
index f281878d17..f281878d17 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index 87cde940e1..87cde940e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/pom.xml
index 2b22d38030..2b22d38030 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 2eea567fff..2eea567fff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index af0b373472..af0b373472 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-multiple-wires/pom.xml
index 39a7f05332..39a7f05332 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-multiple-wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 49df5aa17a..49df5aa17a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3d0b37eeae..3d0b37eeae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/pom.xml
index 823ef6dd18..823ef6dd18 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index f803fb2ec9..f803fb2ec9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/component-type/pom.xml
index 5e9d63778d..5e9d63778d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/Calculator.composite
index ecee33e072..ecee33e072 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 78e169deb4..78e169deb4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 5d66becedf..5d66becedf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 22236ae0d0..22236ae0d0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2035d617e5..2035d617e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index fe76f553be..fe76f553be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/pom.xml
index 20ec8c6ae8..20ec8c6ae8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
index ef2a43c766..ef2a43c766 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/pom.xml
index 1ab420e93c..1ab420e93c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/pom.xml
index cca05b9bb9..cca05b9bb9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..d8133c4acc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/pom.xml
index 7c504aee50..7c504aee50 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/pom.xml
index 40dab26baa..40dab26baa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index 44ceba1240..44ceba1240 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/pom.xml
index 91eb35d6c1..91eb35d6c1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index a53117e72f..a53117e72f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-resource/pom.xml
index 0696df1951..0696df1951 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/pom.xml
index 3d8b5e85c3..3d8b5e85c3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/contribution-import-export/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/pom.xml
index e64ff002e1..e64ff002e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-import-export/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/pom.xml
index 51ee2a349d..51ee2a349d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/src/test/resources/repository/contribution.zip b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 3239ae1242..3239ae1242 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ b/sca-java-2.x/tags/2.0-M4/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/bin-distro-unzip/build.xml
index 68e15d4a8b..68e15d4a8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/bin-distro-unzip/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/bin-distro-unzip/pom.xml
index e87bf00476..e87bf00476 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/binding-ws-calculator/build.xml
index ed22bce2dc..ed22bce2dc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/binding-ws-calculator/pom.xml
index 681e1ed85c..681e1ed85c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/calculator-rmi/build.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/calculator-rmi/build.xml
index 25abf4e040..25abf4e040 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/calculator-rmi/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/calculator-rmi/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/calculator-rmi/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/calculator-rmi/pom.xml
index 7b39859144..7b39859144 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/calculator-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/calculator-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/implementation-java-calculator/build.xml
index 106fee758c..106fee758c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/implementation-java-calculator/pom.xml
index 76f9c786b8..76f9c786b8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/legal-checks/pom.xml
index 5aa8a2a44a..5aa8a2a44a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/legal-checks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 2cbbe57125..2cbbe57125 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/pom.xml
index b62849a2ef..b62849a2ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-bpel/pom.xml
index da7b3f620d..da7b3f620d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
index 5b29292acf..5b29292acf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jms/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jms/pom.xml
index 3d79100bb0..3d79100bb0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
index bc436667c8..bc436667c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-js-client/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-js-client/pom.xml
index bca540e6dc..bca540e6dc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-js-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsf/pom.xml
index 4b4f07f2e4..4b4f07f2e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
index 1f90a772ac..1f90a772ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsp/pom.xml
index 584f2f1038..584f2f1038 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 2be60be081..2be60be081 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-stripes/pom.xml
index 6cb817579f..6cb817579f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 743ab054c8..743ab054c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld/pom.xml
index 2eea7bfcd6..2eea7bfcd6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/distribution/webapp-helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/distribution/webapp-helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/endpoints/pom.xml
index f91d34f151..f91d34f151 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
index c307547f56..c307547f56 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
index 064d615c45..064d615c45 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/EndpointsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/EndpointsTestCase.java
index 7802848c3b..7802848c3b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/EndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/EndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
index f3b6c15bf1..f3b6c15bf1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/Utils.java b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/Utils.java
index 5107d8f660..5107d8f660 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/java/test/Utils.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/java/test/Utils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/resources/helloworld.composite
index 081804b34e..081804b34e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/resources/nested.composite b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/resources/nested.composite
index ffc73644f1..ffc73644f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/endpoints/src/test/resources/nested.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/endpoints/src/test/resources/nested.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/exceptions/pom.xml
index 48a8bea40f..48a8bea40f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/resources/ExceptionTest.composite
index d42866303e..d42866303e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/pom.xml
index 623cef9b09..623cef9b09 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index bd7770ca7d..bd7770ca7d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 747433a9e7..747433a9e7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index eae607a7ca..eae607a7ca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index b033516c1b..b033516c1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index fed509df98..fed509df98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 8bb3006d12..8bb3006d12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index f68134702b..f68134702b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 78b3649b5b..78b3649b5b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java
index 1a0abd7f8f..1a0abd7f8f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index e3d9a36bb8..e3d9a36bb8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 47342fded8..47342fded8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java
index 6f5b280f31..6f5b280f31 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index dea7933e1a..dea7933e1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index b80b05dc08..b80b05dc08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index ecb085858d..ecb085858d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
index 81d59432b8..81d59432b8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index abdaa98bff..abdaa98bff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index dd186bddfc..dd186bddfc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 1c4b81db33..1c4b81db33 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 1000e616a7..1000e616a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
index 278c94a18e..278c94a18e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index 2731fc455f..2731fc455f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index e8357cc62e..e8357cc62e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index b8389be7f6..b8389be7f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 8d1a655c4e..8d1a655c4e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 294b211431..294b211431 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index c77ab00323..c77ab00323 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index b7c45b289f..b7c45b289f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index e1ccbcf3c6..e1ccbcf3c6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index 236e2b23e6..236e2b23e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
index 4a873f2424..4a873f2424 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index 4503294f10..4503294f10 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 2602839d1d..2602839d1d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index 254b8100e1..254b8100e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 8df60c5bab..8df60c5bab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index f5261c85bb..f5261c85bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index 9ff1b74567..9ff1b74567 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 8b12dd7af7..8b12dd7af7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index a44ae38d24..a44ae38d24 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index d54f0544d8..d54f0544d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index 71768f5a7b..71768f5a7b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 73b151bf7a..73b151bf7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 0c2e1daa81..0c2e1daa81 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 8d0c548899..8d0c548899 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index f4bd53876c..f4bd53876c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 0907985d7f..0907985d7f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index 13b84c8c73..13b84c8c73 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 5db9c84c00..5db9c84c00 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/interfaces/pom.xml
index d55c008338..d55c008338 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/resources/InterfacesTest.composite
index 27ada047b9..27ada047b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
index c91d49a49a..c91d49a49a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 31e40d59c5..31e40d59c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
index b1d4dba07d..b1d4dba07d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/pom.xml
index b149bbaf6f..b149bbaf6f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
index 4e55bae98d..4e55bae98d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
index 0bf3328c31..0bf3328c31 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
index a43b85361b..a43b85361b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
index b15ab6be08..b15ab6be08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
index 11ace7a788..11ace7a788 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
index 313edf0435..313edf0435 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
index eb72924093..eb72924093 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jaxws/pom.xml
index 751935be6d..751935be6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
index e1c2bedea3..e1c2bedea3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/StockQuote.java
index 74e25bb3bd..74e25bb3bd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
index 516c63d864..516c63d864 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/resources/StockQuote.composite
index b2c9bd8ddb..b2c9bd8ddb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jaxws/src/test/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jaxws/src/test/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/pom.xml
index e1ab18de9b..e1ab18de9b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
index a9d43b5637..a9d43b5637 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
index cbad991ac5..cbad991ac5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/args/pom.xml
index cb666cac7f..cb666cac7f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
index 07caa57490..07caa57490 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/selectors/selectors.composite
index 1a9075f6d4..1a9075f6d4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/pom.xml
index 9929f87db5..9929f87db5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index a4d5190af3..a4d5190af3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index e8357338ae..e8357338ae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
index 95c3a41c43..95c3a41c43 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/jndi.properties
index dec266b133..dec266b133 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/simple/client.composite
index 19124fc3e6..19124fc3e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index 5ef7c981f0..5ef7c981f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/main/resources/simple/tempq.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index 18911ad8b6..18911ad8b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index b335add358..b335add358 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/pom.xml
index 8d78fde377..8d78fde377 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
index 2a74e465ea..2a74e465ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/defaults/client.composite
index c4d5215f86..c4d5215f86 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/defaults/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/defaults/service.composite
index a4de896f24..a4de896f24 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/defaults/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/pom.xml
index 545ae23615..545ae23615 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
index 07caa57490..07caa57490 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/definitions/definitions.composite
index 67a62a7165..67a62a7165 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/definitions/definitions.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/pom.xml
index e4d8401cba..e4d8401cba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
index c9945cc57d..c9945cc57d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 9eb8f2b27d..9eb8f2b27d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 1e1a0987ad..1e1a0987ad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/pom.xml
index a2a029c018..a2a029c018 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
index c28c94da98..c28c94da98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 5d1c57a1f3..5d1c57a1f3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
index 6875772d56..6875772d56 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 170e28b15d..170e28b15d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/pom.xml
index a4625ca7f9..a4625ca7f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
index 60b132ca1b..60b132ca1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/external/client.composite
index cad76ef45f..cad76ef45f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/external/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/external/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/external/service.composite
index 8a76d8cd29..8a76d8cd29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/external/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/external/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/pom.xml
index 81b31c6f6d..81b31c6f6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index e5a904871c..e5a904871c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/pom.xml
index 6f9cdd01cf..6f9cdd01cf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index a28e6e5f6d..a28e6e5f6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/pom.xml
index 7240897436..7240897436 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index a6d6e04ac8..a6d6e04ac8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/pom.xml
index b0d00e6082..b0d00e6082 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index c624a11233..c624a11233 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
index f72ce434fa..f72ce434fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/pom.xml
index 05c3e3e328..05c3e3e328 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index e037aa74d9..e037aa74d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
index 4625f46578..4625f46578 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index c9609119c9..c9609119c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/pom.xml
index d004ecbc26..d004ecbc26 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index d700a92f20..d700a92f20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstext/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/pom.xml
index e56246376f..e56246376f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index 72e7646704..72e7646704 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
index 53db66ea7e..53db66ea7e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index d64cc46058..d64cc46058 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index b8bc67d5e3..b8bc67d5e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/pom.xml
index aefc85a28c..aefc85a28c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
index 90106d2cbf..90106d2cbf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 967754b6e4..967754b6e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/noreplyto/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/pom.xml
index 9b7054cebe..9b7054cebe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
index 58ceeded7e..58ceeded7e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/service.composite
index 86bb60c147..86bb60c147 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/main/resources/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/pom.xml
index 86bcce2990..86bcce2990 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
index eee9c86565..eee9c86565 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/nulls.composite
index e190cf92c9..e190cf92c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/main/resources/nulls.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/pom.xml
index 16b133aae3..16b133aae3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
index 360b365d1b..360b365d1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index 70a106bf06..70a106bf06 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index 5412a1d6e0..5412a1d6e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/pom.xml
index ed8e7e93b7..ed8e7e93b7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
index 360b365d1b..360b365d1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
index eeeb3b90d0..eeeb3b90d0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
index e41e226994..e41e226994 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/pom.xml
index 7564b32d33..7564b32d33 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
index a930b9e9a7..a930b9e9a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
index 8c608adec9..8c608adec9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index f2761f0b78..f2761f0b78 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/pom.xml
index 7183a4620d..7183a4620d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/pom.xml
index 86d26a4e3e..86d26a4e3e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
index a930b9e9a7..a930b9e9a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/properties/properties.composite
index 73f2a8eadc..73f2a8eadc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/main/resources/properties/properties.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 29d5a345b2..29d5a345b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/pom.xml
index f45de031a0..f45de031a0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
index c062ef9ec0..c062ef9ec0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/cf/client.composite
index 3a03f9b675..3a03f9b675 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/cf/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/cf/service.composite
index d7ba8f2838..d7ba8f2838 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/cf/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/pom.xml
index ccbf1b9a32..ccbf1b9a32 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
index c062ef9ec0..c062ef9ec0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/simple/client.composite
index bed860e2cd..bed860e2cd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/pom.xml
index 6ea78d8107..6ea78d8107 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
index 59cf4aee9d..59cf4aee9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index ab8e29ccdd..ab8e29ccdd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index af36b8af9b..af36b8af9b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index bf10f20d38..bf10f20d38 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/pom.xml
index 9aed46d86e..9aed46d86e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
index 2690297524..2690297524 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/jndi.properties
index 9888d5843b..9888d5843b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index b951484044..b951484044 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index 80c653cc29..80c653cc29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/main/resources/topics/TopicsService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/pom.xml
index 49864fb06c..49864fb06c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
index eeae8fcc59..eeae8fcc59 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/jndi.properties
index 040ec282d7..040ec282d7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/ttl.composite
index 91b64cf8dc..91b64cf8dc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/main/resources/ttl.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/main/resources/ttl.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/pom.xml
index 7c938fb34f..7c938fb34f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
index 3349754e4a..3349754e4a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 9e7b119fad..9e7b119fad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/pom.xml
index 6eea2088c9..6eea2088c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index bf8a588928..bf8a588928 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
index b4ba94220c..b4ba94220c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 9d5e9ae59a..9d5e9ae59a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-iface/pom.xml
index ea5b2dc60a..ea5b2dc60a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-iface/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index 76f8d4400d..76f8d4400d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/pom.xml
index a7cdef93c6..a7cdef93c6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index 81f7e1747d..81f7e1747d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
index c65718909d..c65718909d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 6b2d15b7a6..6b2d15b7a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/one-node-test/pom.xml
index 99192513ad..99192513ad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/one-node-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 6d49b718ef..6d49b718ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/pom.xml
index d08d2c9402..d08d2c9402 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/pom.xml
index cefcd7d6ed..cefcd7d6ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index 5f9453a5d6..5f9453a5d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index b413825106..b413825106 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
index 4a41ae8133..4a41ae8133 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
index 7dfa6e66cc..7dfa6e66cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 769aad1940..769aad1940 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/build.xml
index 933aec2636..933aec2636 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 21b03b97a3..21b03b97a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/client-config.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/client.xml
index bb65805144..bb65805144 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/pom.xml
index b0e4c06ebb..b0e4c06ebb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 14a48f507a..14a48f507a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/server-config.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/server.xml
index 7b6d206b7f..7b6d206b7f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
index b27d16a562..b27d16a562 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/operation-overloading/pom.xml
index 3343eb9d58..3343eb9d58 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/operation-overloading/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/tags/2.0-M4/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/policies/pom.xml
index 1e1ac8f072..1e1ac8f072 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/Customer.composite
index 2a8f598b90..2a8f598b90 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/Customer.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/Customer.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/LoggingMessages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/META-INF/definitions.xml
index 0a39912bf0..0a39912bf0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/META-INF/sca-contribution.xml
index be63597c12..be63597c12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/Payment.composite
index df54d0c1c2..df54d0c1c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/main/resources/Payment.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/main/resources/Payment.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/pom.xml
index fd5759d0aa..fd5759d0aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/properties/pom.xml
index cdf4c0be74..cdf4c0be74 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 1642ab55f5..1642ab55f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 9c7e8c3447..9c7e8c3447 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 64ca749e9f..64ca749e9f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 7c700903d6..7c700903d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index af65f887c0..af65f887c0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/Outer.composite
index 5e767b1e0e..5e767b1e0e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/Outer.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/OuterPropertyTest.composite
index 95ee1157bf..95ee1157bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/PropertyTest.composite
index 36f75d52a1..36f75d52a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/customer.xsd
index 7421750f1b..7421750f1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/customer.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/fileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 6d4180ee2f..6d4180ee2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/mySimpleService.composite
index 3cf25384e6..3cf25384e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/rcProps.txt
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/main/resources/rcprops.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 0906a45ab3..0906a45ab3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index eb217600db..eb217600db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/pom.xml
index 00ff3be9e5..00ff3be9e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 261eff2584..261eff2584 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index f3c9280f96..f3c9280f96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 090bc49a41..090bc49a41 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index 8c1a9a2f72..8c1a9a2f72 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 884a8b0a96..884a8b0a96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index b9b4e3ba7c..b9b4e3ba7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/references/pom.xml
index f094d7be82..f094d7be82 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 3934025e64..3934025e64 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/InnerReferencesTest.composite
index 871a846edf..871a846edf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 52d6fe48c1..52d6fe48c1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/pom.xml
index 48f14e6875..48f14e6875 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 4b9910bb21..4b9910bb21 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/resources/Helloworld.composite
index 3f0e0a164c..3f0e0a164c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
index d8604a5cc0..d8604a5cc0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index a331e4dd22..a331e4dd22 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/scdl/pom.xml
index 21ded9671c..21ded9671c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/scdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index c56545dd3b..c56545dd3b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
index 18fb9394bf..18fb9394bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index 44695e5dde..44695e5dde 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/resources/test.composite
index aa11c0d092..aa11c0d092 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scdl/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/scdl/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/scopes/pom.xml
index 50b70cf391..50b70cf391 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/scopes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/main/resources/scopes.composite
index 83a71218f5..83a71218f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/main/resources/scopes.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 594bdd5038..594bdd5038 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/service-reference/pom.xml
index dab9279fb6..dab9279fb6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
index fb88cd8bea..fb88cd8bea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
index 06e4c63e94..06e4c63e94 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
index 63302847b5..63302847b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/services/pom.xml
index 940c540f03..940c540f03 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/resources/META-INF/sca-contribution.xml
index e21261d8d0..e21261d8d0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/resources/ServicesTest.composite
index e7d56032ea..e7d56032ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/main/resources/ServicesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/pom.xml b/sca-java-2.x/tags/2.0-M4/itest/wires/pom.xml
index 48578c1bd5..48578c1bd5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/resources/WireTest.composite
index 614beaec00..614beaec00 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/main/resources/WireTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/tags/2.0-M4/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/META-INF/MANIFEST.MF
index 210611129b..210611129b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/pom.xml
index f008d48cb1..f008d48cb1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index da8c64b426..da8c64b426 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index a878054d99..a878054d99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index f3f25f0b65..f3f25f0b65 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 9b02df8b7a..9b02df8b7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 026e0426af..026e0426af 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index bcba763c1c..bcba763c1c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index ad1e7cd83f..ad1e7cd83f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 198ddfbfeb..198ddfbfeb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 4b9f07ae7e..4b9f07ae7e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
index dd1b6f5d62..dd1b6f5d62 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
index 320c4eae62..320c4eae62 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
index b47be74712..b47be74712 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index 8ac0de9617..8ac0de9617 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index b545e62469..b545e62469 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index ac4f81d5a9..ac4f81d5a9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 979dad3c8b..979dad3c8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index e647d1e575..e647d1e575 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
index bbbbc93255..bbbbc93255 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7927cc0f6d..7927cc0f6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties
index f12e94d968..f12e94d968 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties
index 857887ec3f..857887ec3f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
index d092b5959a..d092b5959a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index b71764e0a4..b71764e0a4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 9646356eb7..9646356eb7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 42730415b3..42730415b3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 7787361e62..7787361e62 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index cbfec53f65..cbfec53f65 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index 2f13eb8b6d..2f13eb8b6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
index b1720ea8e6..b1720ea8e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index f0bd5d8bde..f0bd5d8bde 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index c39dede56d..c39dede56d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 961a40b841..961a40b841 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2f4518a42c..2f4518a42c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index 0d73d1a189..0d73d1a189 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index bf3676c585..bf3676c585 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9f40faa806..9f40faa806 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 807e256fc5..807e256fc5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 8ca71a0580..8ca71a0580 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 5c7e4435bb..5c7e4435bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 22c01b887a..22c01b887a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 4949cd017f..4949cd017f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index 4325309463..4325309463 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
index dac8e384e3..dac8e384e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index d6082a936d..d6082a936d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b4857c499f..b4857c499f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/LICENSE
index 2ea1dcc129..2ea1dcc129 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/META-INF/MANIFEST.MF
index 05f5c8471e..05f5c8471e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/NOTICE
index 78da9f5010..78da9f5010 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/pom.xml
index 60448657bc..60448657bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
index b59cce55ab..b59cce55ab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index a919c3f2c2..a919c3f2c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 24e0b5a975..24e0b5a975 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
index 16c791e533..16c791e533 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
index b5fc21e9c0..b5fc21e9c0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
index bcb9539c40..bcb9539c40 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
index 7f9baac45c..7f9baac45c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
index b7f58705cd..b7f58705cd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
index 897e869806..897e869806 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
index 24198c943d..24198c943d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
index 4bc2e73d4c..4bc2e73d4c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
index f13fbd1567..f13fbd1567 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
index 7e2cd739fd..7e2cd739fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
index b808125568..b808125568 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index 1dcd515c98..1dcd515c98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
index 74cfe9a739..74cfe9a739 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
index 2034e4d2c8..2034e4d2c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 11239e20d0..11239e20d0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
index 011c7a61ea..011c7a61ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
index e0524ee006..e0524ee006 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
index 777da1e8ab..777da1e8ab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
index 53f6a0a51a..53f6a0a51a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
index 51327ec84e..51327ec84e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
index 045118cb43..045118cb43 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
index 536b592c04..536b592c04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
index faf6d1cfb1..faf6d1cfb1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
index 980e4f90f5..980e4f90f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
index 6df685b881..6df685b881 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
index f803c354cd..f803c354cd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index de7bc6bdd0..de7bc6bdd0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index ce8d47b575..ce8d47b575 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 92142d117d..92142d117d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index 9b15010624..9b15010624 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index dfe819d97f..dfe819d97f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 7a8f45954f..7a8f45954f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/assembly/META-INF/MANIFEST.MF
index a6327b2c98..a6327b2c98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/assembly/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/assembly/pom.xml
index d5967c0e95..d5967c0e95 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 30e2592008..30e2592008 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index fcad39d8cb..fcad39d8cb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 7c0f7cf2ce..7c0f7cf2ce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 96dc906395..96dc906395 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 5c5827637d..5c5827637d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
index 35e5f148ba..35e5f148ba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index d34ec7d01f..d34ec7d01f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index e2a68e2a4d..e2a68e2a4d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 9a6ae4d35a..9a6ae4d35a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index b204b649fe..b204b649fe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 022d829488..022d829488 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index 2a09b5bc6f..2a09b5bc6f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 64a55f1b44..64a55f1b44 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 88cb2f9a2c..88cb2f9a2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 690316aca4..690316aca4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 9c8f6db912..9c8f6db912 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 731c2986b5..731c2986b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
index 5cc43d6333..5cc43d6333 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 59ab8d36fc..59ab8d36fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 7b547e70de..7b547e70de 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 9476251305..9476251305 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index 4d5b1a2ecd..4d5b1a2ecd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 2d918a0592..2d918a0592 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index f72b78cc3a..f72b78cc3a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index f997d03786..f997d03786 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 9d1b3ac20c..9d1b3ac20c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 702826d43e..702826d43e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index aa356e3857..aa356e3857 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 176770e553..176770e553 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 5069b92a50..5069b92a50 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 075b50eec1..075b50eec1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index fc03bfeb88..fc03bfeb88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 5f10af6510..5f10af6510 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
index 8a16fac9e4..8a16fac9e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index ae526b92a1..ae526b92a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 8afe493dec..8afe493dec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 6fa2d18037..6fa2d18037 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
index b1e22e195d..b1e22e195d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
index d40d72ae98..d40d72ae98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
index 2df42c2c23..2df42c2c23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 49995f5ab8..49995f5ab8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index 552d67fec6..552d67fec6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index f18c852e69..f18c852e69 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
index 99d68a11bc..99d68a11bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 4b1d9e437d..4b1d9e437d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index 4c02be42dd..4c02be42dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index b5018c4d43..b5018c4d43 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 20c7ea3206..20c7ea3206 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index af4b3559c5..af4b3559c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index cf7e744e88..cf7e744e88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index b67dbcbb12..b67dbcbb12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 7a63bbedc5..7a63bbedc5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 5c68c6cbff..5c68c6cbff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index f45be80888..f45be80888 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index ead5ecba72..ead5ecba72 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index 247a432330..247a432330 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 1f5620c0b9..1f5620c0b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 70f6d5b403..70f6d5b403 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index cab7057b57..cab7057b57 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 8dfeb29833..8dfeb29833 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
index b24872bf96..b24872bf96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 2a273c9a26..2a273c9a26 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 55f00b82c8..55f00b82c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 6773b29088..6773b29088 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index c1c8400b71..c1c8400b71 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 15581b5e04..15581b5e04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 289fd25594..289fd25594 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 08f859fc8a..08f859fc8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 26144e92cb..26144e92cb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 777fa567f1..777fa567f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 844b0af509..844b0af509 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 54c0a3ec11..54c0a3ec11 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 2598dc8545..2598dc8545 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 12db460959..12db460959 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 26ecf6e352..26ecf6e352 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index e7a93c8907..e7a93c8907 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b79ccdab78..b79ccdab78 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 5b401baeb3..5b401baeb3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index a29f214f98..a29f214f98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 9e7de2f6da..9e7de2f6da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 2b5b8458d5..2b5b8458d5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index 35a86ceedf..35a86ceedf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 6e2941ff5c..6e2941ff5c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index 71e5eef6a7..71e5eef6a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
index f87938a5cb..f87938a5cb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index ebbb4e93a7..ebbb4e93a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
index a9a252e08b..a9a252e08b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
index 4cf9c01da5..4cf9c01da5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 20fd74d46e..20fd74d46e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 5380a319d5..5380a319d5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 6777c33ff1..6777c33ff1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index 24be8a3e7d..24be8a3e7d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index acdaae799e..acdaae799e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 2775c4ac71..2775c4ac71 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF
index 9d69acd1ee..9d69acd1ee 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/pom.xml
index 6dc169f482..6dc169f482 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index c7552f932e..c7552f932e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index 5ba07f5e22..5ba07f5e22 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 6196a727ac..6196a727ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index 697a6140da..697a6140da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
index 19c100483c..19c100483c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
index da7683d84a..da7683d84a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index e93c1aeea6..e93c1aeea6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index b707c71d2b..b707c71d2b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
index 2870002c66..2870002c66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index f802d3891f..f802d3891f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
index 534c2c901f..534c2c901f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
index b091045b8c..b091045b8c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
index 98e4e0ee48..98e4e0ee48 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
index 5b9e0848a0..5b9e0848a0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
index bfeee9b2f4..bfeee9b2f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
index 584f39ea8d..584f39ea8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index fa80fc0a39..fa80fc0a39 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index c029cef2fb..c029cef2fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
index a50a876ac4..a50a876ac4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 090336bc5d..090336bc5d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
index 35e25957fb..35e25957fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
index 49d98f83cf..49d98f83cf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF
index 3a3d6bd22b..3a3d6bd22b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/pom.xml
index 7177555c20..7177555c20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 91cd89e98d..91cd89e98d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 6b8ff10d1a..6b8ff10d1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index b203986264..b203986264 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/pom.xml
index de4fc9c4bc..de4fc9c4bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 9247c1d3db..9247c1d3db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index f2647bdd2e..f2647bdd2e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
index 337bb004b5..337bb004b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/Customer.java
index 8585301868..8585301868 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/Customer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
index 7406b9bd37..7406b9bd37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
index 799bcaa672..799bcaa672 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index 87616330dc..87616330dc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index 943f82c0ed..943f82c0ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/META-INF/MANIFEST.MF
index a8bd2b925f..a8bd2b925f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/pom.xml
index 2c997ac21e..2c997ac21e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index c4a51f93a3..c4a51f93a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index af0eb8ea08..af0eb8ea08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 70d2398d71..70d2398d71 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
index 1d55a38a2f..1d55a38a2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/META-INF/MANIFEST.MF
index b29dc9bc59..b29dc9bc59 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/pom.xml
index 782ba208e2..782ba208e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
index 80881f7859..80881f7859 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index 53383af35e..53383af35e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 8342dd64c8..8342dd64c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
index 41cf245735..41cf245735 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index b5850b7670..b5850b7670 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
index f2456f3175..f2456f3175 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
index fec68138a0..fec68138a0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/test.composite
index 1fb8fce37e..1fb8fce37e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/testCache.composite
index 277556dab4..277556dab4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-http/META-INF/MANIFEST.MF
index 5336512666..5336512666 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-http/pom.xml
index 63d76e422f..63d76e422f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index f3f309a19b..f3f309a19b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
index 372118fbf2..372118fbf2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
index 056bb8a75e..056bb8a75e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index fd69b62555..fd69b62555 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/pom.xml
index df64375975..df64375975 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
index 923d9aa1d1..923d9aa1d1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
index f120055dde..f120055dde 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
index a4a7ff5e5d..a4a7ff5e5d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
index 02f4f1bf1b..02f4f1bf1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
index 2942f93781..2942f93781 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
index d2edae4d23..d2edae4d23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
index 8efd75d40d..8efd75d40d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
index d864543ac6..d864543ac6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
index a71c5d8e5e..a71c5d8e5e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
index 7886c2d138..7886c2d138 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
index 850a3035ab..850a3035ab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
index d4773c52e4..d4773c52e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
index a67c7723e3..a67c7723e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
index e630d0cd53..e630d0cd53 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
index 60d0abe6be..60d0abe6be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
index be5ca5dd61..be5ca5dd61 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
index 8e3055de29..8e3055de29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
index 030790f51b..030790f51b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
index 35154e0232..35154e0232 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
index a263dde29f..a263dde29f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
index 4b82f2155d..4b82f2155d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index 1755a1e2ff..1755a1e2ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index 69d00f4f85..69d00f4f85 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index ea565f8a6b..ea565f8a6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 09fe7310e6..09fe7310e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index 3b008e9b55..3b008e9b55 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
index 84938558bf..84938558bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index 3ff49ce0cc..3ff49ce0cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
index 612dbf783f..612dbf783f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
index bba29ff023..bba29ff023 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
index fd74ae952a..fd74ae952a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
index 6bcd969765..6bcd969765 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
index 831d1246f8..831d1246f8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
index 9536de2bfa..9536de2bfa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
index 374c6d9f66..374c6d9f66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
index 01a58a298e..01a58a298e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
index 9eb4de8fd9..9eb4de8fd9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
index d5eb858192..d5eb858192 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
index bc752ad22b..bc752ad22b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
index 1f28a02328..1f28a02328 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
index 4839eaf396..4839eaf396 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
index 5ed107d06c..5ed107d06c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
index f360db13ff..f360db13ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
index db8416c778..db8416c778 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
index 98ca94e407..98ca94e407 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
index 7bdeb9dae8..7bdeb9dae8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
index deec71a3f6..deec71a3f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
index 2043a122ce..2043a122ce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
index 68d2f8189d..68d2f8189d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
index 47c6e42ad1..47c6e42ad1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
index e82a1d8ffe..e82a1d8ffe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
index f0a5a64f02..f0a5a64f02 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
index af57152d2b..af57152d2b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
index fb96d71811..fb96d71811 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
index 76181c6ba1..76181c6ba1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
index ec3270b8f5..ec3270b8f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
index cc41b1cc28..cc41b1cc28 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
index 335b4c4cb7..335b4c4cb7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
index 53c4950b6e..53c4950b6e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
index 3fe0e66722..3fe0e66722 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
index f83dfb3cd6..f83dfb3cd6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
index e201f15ef3..e201f15ef3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
index 551fa9fb69..551fa9fb69 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
index 3c1afc6d29..3c1afc6d29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms-runtime/src/test/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/META-INF/MANIFEST.MF
index 3a9234ed93..3a9234ed93 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/pom.xml
index 1351e57aca..1351e57aca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
index c195a16ce5..c195a16ce5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
index 8e6684b44d..8e6684b44d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
index be5673bc60..be5673bc60 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 629160d8fd..629160d8fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
index fd43b2c4e9..fd43b2c4e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
index 9361bb0e3c..9361bb0e3c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
index dd30d5ee6b..dd30d5ee6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
index 468295df36..468295df36 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
index 5180427ec6..5180427ec6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
index 2d32b8cf27..2d32b8cf27 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/pom.xml
index 24d4499eaa..24d4499eaa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
index 90daedb647..90daedb647 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
index 851f4b53c9..851f4b53c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
index 4257cc72e2..4257cc72e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
index edacc2d374..edacc2d374 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
index 5ee1f167ea..5ee1f167ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
index 99f2958d0d..99f2958d0d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
index b252eddbed..b252eddbed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
index efec56bbe3..efec56bbe3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
index d058e4869f..d058e4869f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/resources/jquery.html
index a61cee3155..a61cee3155 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp-runtime/src/test/resources/jquery.html
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp-runtime/src/test/resources/jquery.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/META-INF/MANIFEST.MF
index f251fabedb..f251fabedb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/pom.xml
index 92fa6a2d0d..92fa6a2d0d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java
index 1cfbdc3ad7..1cfbdc3ad7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
index 0817fd7969..0817fd7969 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 23ecc89c4c..23ecc89c4c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/NOTICE
index 28064e5de1..28064e5de1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/pom.xml
index 2c8e633d22..2c8e633d22 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index f3abf82520..f3abf82520 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index 4059d5a1f0..4059d5a1f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
index d25861b610..d25861b610 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e5d24f1e1c..e5d24f1e1c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index dca4965378..dca4965378 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index 71d335acc8..71d335acc8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index 322008de1f..322008de1f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index bd9d905475..bd9d905475 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
index f76ec74b16..f76ec74b16 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 08ccb6e6d5..08ccb6e6d5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
index 96dea057e8..96dea057e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
index 635c99a462..635c99a462 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
index 0fb748b0d9..0fb748b0d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index 502b2c2862..502b2c2862 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
index 6a13a7d951..6a13a7d951 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 8d7a60b30f..8d7a60b30f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
index 0cda58286e..0cda58286e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index f7714ece88..f7714ece88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/pom.xml
index ad13f641ab..ad13f641ab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 1d1bd4ed43..1d1bd4ed43 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 21b3d0f6e1..21b3d0f6e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/pom.xml
index 81a07e17e8..81a07e17e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
index a90362de84..a90362de84 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
index 113577b5ee..113577b5ee 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
index 7a87beeb6c..7a87beeb6c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index c572b4e19b..c572b4e19b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
index cbc860ecc6..cbc860ecc6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
index cd7a0fd625..cd7a0fd625 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
index 89ea795529..89ea795529 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
index 461c176e1e..461c176e1e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
index 3b705d2c97..3b705d2c97 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index c62e3a6b8b..c62e3a6b8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 6def6715fd..6def6715fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index 5a68cdde8d..5a68cdde8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 06c1c5e9fc..06c1c5e9fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/META-INF/MANIFEST.MF
index 7154d14e1a..7154d14e1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/pom.xml
index 929fc723aa..929fc723aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
index 498d03c60e..498d03c60e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-axis2-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
index b26b8a0cbd..b26b8a0cbd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/pom.xml
index 3e6ded8bc8..3e6ded8bc8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 4e3f6d82e7..4e3f6d82e7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 77ec50b097..77ec50b097 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index b6b98b6b5f..b6b98b6b5f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4f3bf6e20a..4f3bf6e20a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index a0bfe7409e..a0bfe7409e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index ad272528d8..ad272528d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 30919c5cb0..30919c5cb0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index c65e4ea5c9..c65e4ea5c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/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-M4-RC3/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
index 385c456ddf..385c456ddf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
index bab26454ba..bab26454ba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
index f02c77a01e..f02c77a01e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
index d7685c6143..d7685c6143 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
index e0fae3c988..e0fae3c988 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
index d7685c6143..d7685c6143 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
index dece7b0d63..dece7b0d63 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
index 4579442a99..4579442a99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
index 00ac746111..00ac746111 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
index 944dd0b625..944dd0b625 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
index 87945b6692..87945b6692 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
index f94b6d3ba0..f94b6d3ba0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
index 00afc5b7f4..00afc5b7f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/META-INF/MANIFEST.MF
index 159e362c07..159e362c07 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/pom.xml
index 4691d63f8b..4691d63f8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
index c4daa7c727..c4daa7c727 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
index 110d15a1cf..110d15a1cf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
index 2679b88dd1..2679b88dd1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index de21974095..de21974095 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index 4dee1b8601..4dee1b8601 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index c00df2ef35..c00df2ef35 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index 119d66d14d..119d66d14d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index be464172ed..be464172ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/resources/Calculator.composite
index c404b3bcd4..c404b3bcd4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
index 85535842be..85535842be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
index 992af5dd44..992af5dd44 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/pom.xml
index 819e693f96..819e693f96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
index 985f387178..985f387178 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
index 0d08d42bc5..0d08d42bc5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
index 5cf095a67f..5cf095a67f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
index 00f93fed26..00f93fed26 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
index cb2f004070..cb2f004070 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
index c772702526..c772702526 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
index 9bfa1b8804..9bfa1b8804 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/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-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
index dfedaf97a5..dfedaf97a5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/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-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
index c224e7615a..c224e7615a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
index f25bd8c0cc..f25bd8c0cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
index 7c163e5db2..7c163e5db2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
index 64d816a8e7..64d816a8e7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
index 98d011a8fc..98d011a8fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
index 9c2418a44f..9c2418a44f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
index 9037f3d9de..9037f3d9de 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
index a05f04ad01..a05f04ad01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
index 88c77711eb..88c77711eb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
index 36916f4ff5..36916f4ff5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
index c593f07780..c593f07780 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 44df88c1e9..44df88c1e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index c87c49a145..c87c49a145 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
index 44f98b157c..44f98b157c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
index cc84a83a47..cc84a83a47 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index ae68eec237..ae68eec237 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/pom.xml
index bc9d96dd0d..bc9d96dd0d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 46c97e7553..46c97e7553 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
index a04e0d54e5..a04e0d54e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ConfiguratorHelper.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ConfiguratorHelper.java
index a7dc09ea6d..a7dc09ea6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ConfiguratorHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ConfiguratorHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index abf5f4008d..abf5f4008d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
index 2aabce9937..2aabce9937 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
index b6aac923a0..b6aac923a0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index be4e902eaa..be4e902eaa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
index 795b3b256f..795b3b256f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index 2cd176aae0..2cd176aae0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 4f7e308eb5..4f7e308eb5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
index debb2c5764..debb2c5764 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index da02d1033e..da02d1033e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
index c8050912d6..c8050912d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
index 3527061a66..3527061a66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java
index eb1e1a27aa..eb1e1a27aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListenerManager.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 55f1592657..55f1592657 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
index eba7a01798..eba7a01798 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
index 647f934c02..647f934c02 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-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-M4-RC3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index fba2858221..fba2858221 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 68f0372b61..68f0372b61 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
index ea32836f2a..ea32836f2a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
index e6e70dfd4b..e6e70dfd4b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
index ec870734a5..ec870734a5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
index e69de29bb2..e69de29bb2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
index 2ce23bf2c4..2ce23bf2c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
index d4d20414e5..d4d20414e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
index 767f59646f..767f59646f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
index e5e76af0b7..e5e76af0b7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
index b9407c5778..b9407c5778 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
index 16ff6f8e8c..16ff6f8e8c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
index 2dc7d8dee4..2dc7d8dee4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
index 4ea341f05c..4ea341f05c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
index 4e1e7dbdad..4e1e7dbdad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
index 3e96480c20..3e96480c20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
index d028ced69e..d028ced69e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
index c7b503af17..c7b503af17 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
index 3ac30780b3..3ac30780b3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
index 0dd6e90c72..0dd6e90c72 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
index f30286feea..f30286feea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
index 09b414b2d8..09b414b2d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
index 13a16c8e8a..13a16c8e8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
index 0e50781061..0e50781061 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
index 82f61bd7c2..82f61bd7c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
index 71d7bf68fb..71d7bf68fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
index 4bb5bdb87d..4bb5bdb87d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
index 017d9bb478..017d9bb478 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
index b7146098ec..b7146098ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
index 1616f80cb4..1616f80cb4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
index 51aa9f25f8..51aa9f25f8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
index 0b780f2b96..0b780f2b96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index bbec9dd342..bbec9dd342 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
index 01abbd5382..01abbd5382 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
index a41e0fd2c9..a41e0fd2c9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
index 661afdddad..661afdddad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
index 9b2e0eafa0..9b2e0eafa0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
index 98d9a73926..98d9a73926 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
index 201d11a79f..201d11a79f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
index 23dcd5ff6d..23dcd5ff6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
index e020b03041..e020b03041 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCaseOFF.java
index ddd8fc0e5a..ddd8fc0e5a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
index 60b28ca4db..60b28ca4db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
index 6591f2fc32..6591f2fc32 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data.java
index 8c1e6b68da..8c1e6b68da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data2.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data2.java
index 25954a0603..25954a0603 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data2.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/Data2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/POJOWSTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/POJOWSTestCase.java
index 3dcbe0d6f2..3dcbe0d6f2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/POJOWSTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/POJOWSTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestService.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestService.java
index c055d4909f..c055d4909f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestServiceImpl.java
index 4eec594a47..4eec594a47 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/TestServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/package-info.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/package-info.java
index 9224baae29..9224baae29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/package-info.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/package-info.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCaseOFF.java
index 270ec4d097..270ec4d097 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
index ff2d96c3a5..ff2d96c3a5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
index 0b5a5031ce..0b5a5031ce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
index 14e69e7989..14e69e7989 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
index e27514681b..e27514681b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index fde1864e43..fde1864e43 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCaseOFF.java
index 7144ad4b41..7144ad4b41 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCaseOFF.java
index a6223a3ccc..a6223a3ccc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
index 88fc0d63fa..88fc0d63fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
index 0d8914156f..0d8914156f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
index 5840f71057..5840f71057 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
index cdf96bdb58..cdf96bdb58 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCaseOFF.java
index 81f2690709..81f2690709 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
index 1437c2c866..1437c2c866 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
index 915c4f51c7..915c4f51c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
index 8f3cd9fe32..8f3cd9fe32 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCaseOFF.java
index 9070053ece..9070053ece 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
index 2bd6d41427..2bd6d41427 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCaseOFF.java
index dd215180fc..dd215180fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCaseOFF.java
index 45c0a6932a..45c0a6932a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCaseOFF.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCaseOFF.java
index c74ffee695..c74ffee695 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 9f9d98d861..9f9d98d861 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index f8e3f11284..f8e3f11284 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index 3c8ed37414..3c8ed37414 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
index 421d5d6166..421d5d6166 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
index 39d814ea40..39d814ea40 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
index b78909142f..b78909142f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index 9c11895223..9c11895223 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index 5852d58b19..5852d58b19 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index d72d0b4239..d72d0b4239 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index aefe1b41a1..aefe1b41a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 1d3ea6e91e..1d3ea6e91e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
index 7bf47bc412..7bf47bc412 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index 4367e2d88d..4367e2d88d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
index 29be66fb71..29be66fb71 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 24a66ccbca..24a66ccbca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index 4d605a2012..4d605a2012 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
index 5908c43e7d..5908c43e7d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
index 8887b3452f..8887b3452f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
index 3dcef5ab46..3dcef5ab46 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
index 74aff65651..74aff65651 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
index 60673ab103..60673ab103 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
index bc3107c388..bc3107c388 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
index ae07495cf3..ae07495cf3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index e46345bdbc..e46345bdbc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
index cb188e6676..cb188e6676 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index 19a8521f61..19a8521f61 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
index 9a2ed7d29a..9a2ed7d29a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index fb08fee447..fb08fee447 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
index cb188e6676..cb188e6676 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
index 780130e699..780130e699 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
index dd0a102476..dd0a102476 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
index 904c0b469e..904c0b469e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index 8a5aacf916..8a5aacf916 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
index 307edb9b37..307edb9b37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
index 686b08a1d4..686b08a1d4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
index 99a8c6d81d..99a8c6d81d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
index 80e4b62801..80e4b62801 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index 95e93419da..95e93419da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 9f035663bc..9f035663bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index 3ed8b206a7..3ed8b206a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
index f7caa55fce..f7caa55fce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
index 6118743da3..6118743da3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
index 5d7c3a3457..5d7c3a3457 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/pom.xml
index 9cfa2491d7..9cfa2491d7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index 67a165f1f5..67a165f1f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index bfd95bd292..bfd95bd292 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
index 985d9cb88d..985d9cb88d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
index a94c1d9bef..a94c1d9bef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/META-INF/MANIFEST.MF
index 7546d43106..7546d43106 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/pom.xml
index b98fb5040e..b98fb5040e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 5e0f8a0a88..5e0f8a0a88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index c1981b8809..c1981b8809 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 2966a1ef81..2966a1ef81 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 46330c13f5..46330c13f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 678dfa1e2f..678dfa1e2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
index 2dfa5e6133..2dfa5e6133 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index 558365b05e..558365b05e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 1952d83755..1952d83755 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 6d36198124..6d36198124 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-2.x/tags/2.0-M4/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 036b5f0d1a..036b5f0d1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/builder/META-INF/MANIFEST.MF
index df432f10c2..df432f10c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/builder/pom.xml
index cad5e5ff18..cad5e5ff18 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
index 111680b2b4..111680b2b4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BaseBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
index 205a3157de..205a3157de 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 431d21179c..431d21179c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferencePromotionBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferencePromotionBuilderImpl.java
index aaa9cbe82c..aaa9cbe82c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferencePromotionBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferencePromotionBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
index 75fda5880a..75fda5880a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
index b4a897af54..b4a897af54 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
index f36a702752..f36a702752 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
index 6b181db0c1..6b181db0c1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
index b1cc873914..b1cc873914 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
index 206afb98da..206afb98da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
index cbbf54b330..cbbf54b330 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
index 67b143e95d..67b143e95d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ReferenceConfigurationUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ServiceConfigurationUtil.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ServiceConfigurationUtil.java
index ef03344131..ef03344131 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ServiceConfigurationUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
index b543e3347d..b543e3347d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
index 0c7105bd9f..0c7105bd9f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
index d6082a936d..d6082a936d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
index 105a478842..105a478842 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
index d3d5bafdfc..d3d5bafdfc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
index 12aa35b694..12aa35b694 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
index 141ff2a4ea..141ff2a4ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
index fe76d0038a..fe76d0038a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
index dac8e384e3..dac8e384e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/common-java/META-INF/MANIFEST.MF
index 1795f1eacf..1795f1eacf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/common-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/common-java/pom.xml
index 3ada1b0067..3ada1b0067 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/common-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java b/sca-java-2.x/tags/2.0-M4/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java
index b4b99ff9e5..b4b99ff9e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java b/sca-java-2.x/tags/2.0-M4/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java
index cc3fb4676d..cc3fb4676d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java b/sca-java-2.x/tags/2.0-M4/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java
index d3f472d463..d3f472d463 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java b/sca-java-2.x/tags/2.0-M4/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java
index 469da29e38..469da29e38 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/common-xml/META-INF/MANIFEST.MF
index 1a40ccd3b9..1a40ccd3b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/common-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/common-xml/pom.xml
index 9d2c285f20..9d2c285f20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/common-xml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java b/sca-java-2.x/tags/2.0-M4/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
index 33a97f4342..33a97f4342 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java b/sca-java-2.x/tags/2.0-M4/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
index f2f63e80c6..f2f63e80c6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java b/sca-java-2.x/tags/2.0-M4/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
index 09d9d3062d..09d9d3062d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/META-INF/MANIFEST.MF
index c70f81ea94..c70f81ea94 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/pom.xml
index 8aeeebd9af..8aeeebd9af 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java b/sca-java-2.x/tags/2.0-M4/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
index 91f2bba5c5..91f2bba5c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/contribution/META-INF/MANIFEST.MF
index a32ad146da..a32ad146da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/contribution/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/contribution/pom.xml
index 556ffc6037..556ffc6037 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index e3e1bd8fac..e3e1bd8fac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index bdc523c33e..bdc523c33e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index cba867cb80..cba867cb80 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
index 5f26c3d907..5f26c3d907 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
index b2eddb8336..b2eddb8336 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
index 20798dcd17..20798dcd17 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index a6e5afe7b8..a6e5afe7b8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 256a2387f1..256a2387f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c6c0aff737..c6c0aff737 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index 7be9472fc9..7be9472fc9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
index da8c879a93..da8c879a93 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index 86146fc31b..86146fc31b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index de25081832..de25081832 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index c16660277a..c16660277a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index 8af36d7da0..8af36d7da0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index a23f38e8ef..a23f38e8ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 2efa8d6aca..2efa8d6aca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index 817e5a5ee2..817e5a5ee2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
index 3b99eba586..3b99eba586 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
index 6fd7d0c91e..6fd7d0c91e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
index fe1a09d398..fe1a09d398 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
index 0039dd9f8b..0039dd9f8b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
index 286c9dc791..286c9dc791 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index da7a57a687..da7a57a687 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
index 16404ec78a..16404ec78a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index 8927acd776..8927acd776 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 0cfcf004b2..0cfcf004b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
index d33b2c1028..d33b2c1028 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index dd098283bc..dd098283bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 4806d443eb..4806d443eb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
index 756cd9eb78..756cd9eb78 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index bd5731c594..bd5731c594 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
index 09a6b7dd80..09a6b7dd80 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index f3555ee71e..f3555ee71e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index ac16d413eb..ac16d413eb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index ec8495d1d2..ec8495d1d2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
index 74f0f2d71d..74f0f2d71d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index d2f29a001b..d2f29a001b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 610a1eb7ba..610a1eb7ba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
index 144302c3e4..144302c3e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
index 2c5b849a20..2c5b849a20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 4700041775..4700041775 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6aba85a94d..6aba85a94d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/main/resources/contribution-java-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
index 09fc3e9fff..09fc3e9fff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
index c1cbd06e7f..c1cbd06e7f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-validation-messages.properties
index 63c4746a4d..63c4746a4d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
index 4827fd5e94..4827fd5e94 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index f25fb5d981..f25fb5d981 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index f3b52117bb..f3b52117bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index cec66b23c3..cec66b23c3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 03407f9065..03407f9065 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 1d0ea5dc8a..1d0ea5dc8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/test.ext b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/contribution/src/test/resources/test.ext
+++ b/sca-java-2.x/tags/2.0-M4/modules/contribution/src/test/resources/test.ext
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/META-INF/MANIFEST.MF
index 7f15944428..7f15944428 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/pom.xml
index 5faf7fb1a7..5faf7fb1a7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 7146f0fa36..7146f0fa36 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 71e2a24def..71e2a24def 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index 3422713bb3..3422713bb3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 08442134b9..08442134b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index 446651c918..446651c918 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 679897b59b..679897b59b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index a4466bfd1a..a4466bfd1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/core-spi/META-INF/MANIFEST.MF
index 170bc6314d..170bc6314d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/core-spi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/core-spi/pom.xml
index 3d7cd93a87..3d7cd93a87 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/doc/Context Model.emx b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/doc/Context Model.emx
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index d956689af3..d956689af3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
index a805985a11..a805985a11 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index c079a9dc66..c079a9dc66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index d8f15b411c..d8f15b411c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 4f131365fa..4f131365fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 9bf8355ef1..9bf8355ef1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index af8ad6e582..af8ad6e582 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
index 4482eaa0bb..4482eaa0bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
index 785ac70271..785ac70271 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0e94a28d98..0e94a28d98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 2ee058a14d..2ee058a14d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
index f385c7dfba..f385c7dfba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
index 183b38cb33..183b38cb33 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 00ef0d1c3c..00ef0d1c3c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index 564e6c633b..564e6c633b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
index 6e7f2bd554..6e7f2bd554 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
index 3ea9d0ac3c..3ea9d0ac3c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
index 278bb23e0a..278bb23e0a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
index b3a2b4763e..b3a2b4763e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
index fd748df6ca..fd748df6ca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
index f4e18f60cc..f4e18f60cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
index 7b71406ac6..7b71406ac6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
index 78a0e19f10..78a0e19f10 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
index 09f4a4d78d..09f4a4d78d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
index c56869170a..c56869170a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 5f9ff4fa7e..5f9ff4fa7e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 0105abd6e4..0105abd6e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
index 7000da9093..7000da9093 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
index 86c808c0fb..86c808c0fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index c0150c6138..c0150c6138 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index 6d18b48002..6d18b48002 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index dfe7f6cdde..dfe7f6cdde 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/core/META-INF/MANIFEST.MF
index 5205527437..5205527437 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/core/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/core/pom.xml
index 88a7915820..88a7915820 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 8c84a9e399..8c84a9e399 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index ecc1a4e599..ecc1a4e599 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
index 2ad61963e0..2ad61963e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index 82f8ebabea..82f8ebabea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index 3fdc35a720..3fdc35a720 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
index ffa488b7bd..ffa488b7bd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index 357d19091b..357d19091b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index 2b1c85b95a..2b1c85b95a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index 3284168aeb..3284168aeb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
index 9b60415132..9b60415132 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
index 5218a7fd01..5218a7fd01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index 4e71181747..4e71181747 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index e8a1254dc9..e8a1254dc9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 23126b5123..23126b5123 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
index 2371897dce..2371897dce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index d4fe266d44..d4fe266d44 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index 021d588cb4..021d588cb4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 11edc283a4..11edc283a4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fbdfe8a8e6..fbdfe8a8e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index ec2f0a0664..ec2f0a0664 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index d75ff309ff..d75ff309ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 43726b85dd..43726b85dd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 2fc3d6c7eb..2fc3d6c7eb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
index aeccfa8b05..aeccfa8b05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
index 60914f799b..60914f799b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index e64b9f3068..e64b9f3068 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 148749922e..148749922e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index 853e28fafa..853e28fafa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index 53fab3392c..53fab3392c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
index 1649eade87..1649eade87 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
index 3240b4e50d..3240b4e50d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
index bab83bad2d..bab83bad2d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a7f2ef64f..0a7f2ef64f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 2398ecea3e..2398ecea3e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 30d5c77181..30d5c77181 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index 9e6f3b3087..9e6f3b3087 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index e7728ca9a9..e7728ca9a9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index c5c7e543ac..c5c7e543ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index 9ca8971396..9ca8971396 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 576e52d8ea..576e52d8ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/endpoint-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/endpoint-validation-messages.properties
index 7be0f2b4a2..7be0f2b4a2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/main/resources/endpoint-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/main/resources/endpoint-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
index c0f35d427c..c0f35d427c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index ca7bf9b3d7..ca7bf9b3d7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-2.x/tags/2.0-M4/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/data-api/META-INF/MANIFEST.MF
index 1e48fa6477..1e48fa6477 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/data-api/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/data-api/pom.xml
index 635aa029f9..635aa029f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
index f1841c975e..f1841c975e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
index 5903fd95a4..5903fd95a4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/META-INF/MANIFEST.MF
index bc9ebc0bc8..bc9ebc0bc8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/pom.xml
index 34c3a7818f..34c3a7818f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index a2e6abbf19..a2e6abbf19 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index d2a7f861e8..d2a7f861e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index 6d8d4dce99..6d8d4dce99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index b2c004324c..b2c004324c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 01e7003b20..01e7003b20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 9eccd52d74..9eccd52d74 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 761185c297..761185c297 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 7453cb787a..7453cb787a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/order.wsdl
index 913d9e4928..913d9e4928 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index a59109acef..a59109acef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/pom.xml
index c1c3f74227..c1c3f74227 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index 862894be09..862894be09 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index aa5fc5b789..aa5fc5b789 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/META-INF/MANIFEST.MF
index de480e1e3f..de480e1e3f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/pom.xml
index 2d744bcd93..2d744bcd93 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 08ea27725d..08ea27725d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index ba156ba548..ba156ba548 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index a611219f21..a611219f21 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index 61e4066ee8..61e4066ee8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index c68456e733..c68456e733 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index bd214cb02c..bd214cb02c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 6236a336a3..6236a336a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 2ffb565745..2ffb565745 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 898e5b07bc..898e5b07bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index 8af51f6f5c..8af51f6f5c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 7f616ac5e9..7f616ac5e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index e612af396b..e612af396b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 04e8cb44f3..04e8cb44f3 100755
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/META-INF/MANIFEST.MF
index 21024b3efd..21024b3efd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/pom.xml
index 1cc23c58b8..1cc23c58b8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4e08384f09..4e08384f09 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b70f772696..b70f772696 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 28cadc6666..28cadc6666 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index bc6184189a..bc6184189a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index 0d52c66e17..0d52c66e17 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index 866b9ff6ec..866b9ff6ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index ff5968bccd..ff5968bccd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 9a719fc743..9a719fc743 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index fb02d27b05..fb02d27b05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 800e4a43fb..800e4a43fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 874378bf92..874378bf92 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/databinding/META-INF/MANIFEST.MF
index 324feab09a..324feab09a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/databinding/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/databinding/pom.xml
index 0b837dc004..0b837dc004 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 7c4ed35eb3..7c4ed35eb3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 2ff5d866b4..2ff5d866b4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 19455fcd29..19455fcd29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 39889b1e97..39889b1e97 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 8184d739a8..8184d739a8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index 81264923eb..81264923eb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index ece8027c29..ece8027c29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 9ffadd1eae..9ffadd1eae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 4f949f7dff..4f949f7dff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index ee4e35555c..ee4e35555c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index e940f8675f..e940f8675f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 51ca792171..51ca792171 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index cb9f2969e2..cb9f2969e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 94a2cdb0bb..94a2cdb0bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 01916dfb96..01916dfb96 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index 95afd45380..95afd45380 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 70efd6a5c5..70efd6a5c5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 45896ca6a1..45896ca6a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 195c04e9c2..195c04e9c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index c91176fc2c..c91176fc2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 9ffa950f1a..9ffa950f1a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a5b8e0a0bd..a5b8e0a0bd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index fb747864e7..fb747864e7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 4942fef0da..4942fef0da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index b94b944a98..b94b944a98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 4981699792..4981699792 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index b8b97d4425..b8b97d4425 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 6a30605f0f..6a30605f0f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
index 34a82fd2d3..34a82fd2d3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index ed0b5c9923..ed0b5c9923 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 5f583da283..5f583da283 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index 39116ba4a1..39116ba4a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index e40c3006fb..e40c3006fb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 3b7bd3088a..3b7bd3088a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 5500d0bcca..5500d0bcca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index 3c9022bc3c..3c9022bc3c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 1b54b1fd1e..1b54b1fd1e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index c9631595dc..c9631595dc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 3d89a26cab..3d89a26cab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 70387fa862..70387fa862 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 188ecaffa3..188ecaffa3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index b6b3c05462..b6b3c05462 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index 54b281acb5..54b281acb5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 8a2b6b39aa..8a2b6b39aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 2ed548ad76..2ed548ad76 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index ed57992910..ed57992910 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f8967e35b6..f8967e35b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 548342094e..548342094e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index c56dba1843..c56dba1843 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index c2de202a9b..c2de202a9b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index ac46bfd3d9..ac46bfd3d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 5ab7272d58..5ab7272d58 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index 2ebfcf06e9..2ebfcf06e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index a45c563293..a45c563293 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index fa06303433..fa06303433 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 22b173dce5..22b173dce5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index 7d14cd9dd1..7d14cd9dd1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index d48711cd64..d48711cd64 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index a74a8e5550..a74a8e5550 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index 682fbd4243..682fbd4243 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 516b57c851..516b57c851 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index a8657a5be8..a8657a5be8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index fb9895f120..fb9895f120 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/deployment/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/deployment/META-INF/MANIFEST.MF
index c0c86e615c..c0c86e615c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/deployment/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/deployment/pom.xml
index 35d0afda1d..35d0afda1d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
index 42c7596b15..42c7596b15 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
index c510d10e47..c510d10e47 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
index 65958a493c..65958a493c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/deployment/src/test/java/hello/deployer/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
index 2480a5e4d9..2480a5e4d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
index fc81dc2167..fc81dc2167 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
index cc2bf92dcf..cc2bf92dcf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
index f00e00a373..f00e00a373 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
index b4fee2c7a6..b4fee2c7a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/domain-node/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/domain-node/META-INF/MANIFEST.MF
index abec7ae294..abec7ae294 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/domain-node/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/domain-node/pom.xml
index ea7d82e99c..ea7d82e99c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
index 9a10cbd306..9a10cbd306 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index 1259870c37..1259870c37 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
index 2d8d15342a..2d8d15342a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
index ee15dfba12..ee15dfba12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
index 1d31a5467f..1d31a5467f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
index 20d7470a66..20d7470a66 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
index a5c829b87f..a5c829b87f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
index 3ee89b0a04..3ee89b0a04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
+++ b/sca-java-2.x/tags/2.0-M4/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/META-INF/MANIFEST.MF
index 82533cda1b..82533cda1b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/README b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/README
index 502776b568..502776b568 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/README
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/TODO b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/TODO
index 3f239cf3c0..3f239cf3c0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/TODO
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/TODO
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/pom.xml
index 2f683a1797..2f683a1797 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
index 04b260de0f..04b260de0f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index 0836d07fd1..0836d07fd1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-dht/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-dht/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/META-INF/MANIFEST.MF
index 83df715831..83df715831 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/pom.xml
index 0887885790..0887885790 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
index 98c6739854..98c6739854 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
index ac2933564e..ac2933564e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
index 762407604d..762407604d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index a16785beef..a16785beef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
index a574ba9328..a574ba9328 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF
index 3a43caa6e4..3a43caa6e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/NOTICE
index db5ab284d5..db5ab284d5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/pom.xml
index 19a61006cc..19a61006cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 2b3e087e52..2b3e087e52 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 4ccaf57c19..4ccaf57c19 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index deb4221f4f..deb4221f4f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
index afee051f61..afee051f61 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility-equinox/src/test/resources/test-bundle.jar
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility-equinox/src/test/resources/test-bundle.jar
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/extensibility/META-INF/MANIFEST.MF
index 147f17e4a1..147f17e4a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/extensibility/NOTICE
index e158aa1bfd..e158aa1bfd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/extensibility/pom.xml
index 85bf9b4057..85bf9b4057 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 3ffe893553..3ffe893553 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
index 2ccb192fdb..2ccb192fdb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index fc958afad5..fc958afad5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 41e2377db5..41e2377db5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 762fcad7aa..762fcad7aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
index 4d38cb8afe..4d38cb8afe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
index 7a461a5773..7a461a5773 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index f05c11f9b6..f05c11f9b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index 7070d33f2c..7070d33f2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index bfeeac5696..bfeeac5696 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
index e6ccb22ed5..e6ccb22ed5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index 08b2ac2c3f..08b2ac2c3f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 209a30b08e..209a30b08e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
index 993f6c6338..993f6c6338 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index aebd6cd3de..aebd6cd3de 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index b5f26c7a34..b5f26c7a34 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
index 975a7692ab..975a7692ab 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index c0aac21596..c0aac21596 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
index 9758cba3b4..9758cba3b4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
index 0a5f4d6442..0a5f4d6442 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
index 7a2f680d16..7a2f680d16 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
index 7920fdf4f4..7920fdf4f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-http-osgi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/META-INF/MANIFEST.MF
index efe05b13da..efe05b13da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/pom.xml
index b64eef7711..b64eef7711 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
index 3cfca3e6c8..3cfca3e6c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
index db77162b41..db77162b41 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
index 789deeb94e..789deeb94e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
index b38543a7e9..b38543a7e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/resources/content/test.html
index 9ee377e1ff..9ee377e1ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/resources/tuscany.keyStore b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http-osgi/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http-osgi/src/test/resources/tuscany.keyStore
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-http/META-INF/MANIFEST.MF
index b4ad3f121e..b4ad3f121e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-http/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-http/pom.xml
index 2cd779140d..2cd779140d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 04b2f4c199..04b2f4c199 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 4dfa1dd8a3..4dfa1dd8a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index dffc1e73d4..dffc1e73d4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index fbd085ba2b..fbd085ba2b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-jetty/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/META-INF/MANIFEST.MF
index 1a782368bc..1a782368bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/pom.xml
index 3b9e19fd00..3b9e19fd00 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index b966e38a29..b966e38a29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index 2ab9e46b10..2ab9e46b10 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty/src/test/resources/tuscany.keyStore
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/META-INF/MANIFEST.MF
index 915d62fa41..915d62fa41 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/pom.xml
index 88aeb58d2c..88aeb58d2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
index dc6f155f80..dc6f155f80 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
index ae8e196147..ae8e196147 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
index 99278c123b..99278c123b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
index ff6894e858..ff6894e858 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/resources/tuscany.keyStore b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-jetty7/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-jetty7/src/test/resources/tuscany.keyStore
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/META-INF/MANIFEST.MF
index 686ee33f4a..686ee33f4a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/pom.xml
index 635cba7222..635cba7222 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index cc819d194c..cc819d194c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index 2f3e2311ed..2f3e2311ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index bf8659c254..bf8659c254 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/META-INF/MANIFEST.MF
index fca93beabf..fca93beabf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/NOTICE
index f5efe99703..f5efe99703 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/pom.xml
index af90c58fad..af90c58fad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
index 4ad9519ad8..4ad9519ad8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index 62c238e135..62c238e135 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index 72a76a789e..72a76a789e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 4e32d8bcad..4e32d8bcad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/LICENSE
index baba9ca048..baba9ca048 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
index 5e40de7a52..5e40de7a52 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/NOTICE
index a2f696be26..a2f696be26 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/pom.xml
index 2a1749b1e2..2a1749b1e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index d812a64e1c..d812a64e1c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
index 079a0f96f5..079a0f96f5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
index 55bde26c08..55bde26c08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index 19e7d3e913..19e7d3e913 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index 68492a5dbb..68492a5dbb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index dfe11600f0..dfe11600f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
index 1799a5ebd3..1799a5ebd3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
index 82b3c09723..82b3c09723 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/META-INF/MANIFEST.MF
index 5e88dde880..5e88dde880 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/NOTICE
index a2f696be26..a2f696be26 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/pom.xml
index 184953dd05..184953dd05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index f8f7ee0ae2..f8f7ee0ae2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index ac02b696cc..ac02b696cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index ad8b3a7bcf..ad8b3a7bcf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index 6b12f6666e..6b12f6666e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 6a2d6310c0..6a2d6310c0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5b53ed1ee0..5b53ed1ee0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
index b6d8bdc0f1..b6d8bdc0f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index c56ab48854..c56ab48854 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index ab4d626d6e..ab4d626d6e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/pom.xml
index a319078096..a319078096 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index ba71abd826..ba71abd826 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index fbc2ace341..fbc2ace341 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 01c3b148f8..01c3b148f8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index 602dc5d31a..602dc5d31a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 6929b5d0ca..6929b5d0ca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 476ed9ac83..476ed9ac83 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 55765ef6e4..55765ef6e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 36d9878fd9..36d9878fd9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
index 14d99e8b02..14d99e8b02 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF
index 517aaac39f..517aaac39f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/pom.xml
index 283a76cb02..283a76cb02 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index d3c9c16f48..d3c9c16f48 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 6cb5e3730b..6cb5e3730b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index aefc5c7e6b..aefc5c7e6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 9e4c2eb8f4..9e4c2eb8f4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index ce4a0ef928..ce4a0ef928 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index b951e17fd2..b951e17fd2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 68f0b46f2e..68f0b46f2e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 25f31c5f12..25f31c5f12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 87a8031ea7..87a8031ea7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 8d67236fe2..8d67236fe2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 79a0adac88..79a0adac88 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index d30ac074af..d30ac074af 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 30ed5dda44..30ed5dda44 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 3537dc97cf..3537dc97cf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index aa889448f6..aa889448f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
index 2760b94e39..2760b94e39 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
index 337a0b8458..337a0b8458 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
index 64298b6275..64298b6275 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
index 9f64dc8bca..9f64dc8bca 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
index f5b8ff5be0..f5b8ff5be0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
index d146d23153..d146d23153 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
index ffe09c3dde..ffe09c3dde 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index b82205863c..b82205863c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index d591123aef..d591123aef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index f4182679bc..f4182679bc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 88a8e346c7..88a8e346c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 60d63a3e5f..60d63a3e5f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/implementation-osgi-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
index 986e931927..986e931927 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/pom.xml
index f9203471f2..f9203471f2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java
index e54d2eee7b..e54d2eee7b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 9111a7d03c..9111a7d03c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java
index a1de00d240..a1de00d240 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
index f531c2c4ed..f531c2c4ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
index 2503be0b13..2503be0b13 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/META-INF/MANIFEST.MF
index 9956060457..9956060457 100755
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/pom.xml
index f89ab2c5b9..f89ab2c5b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
index be39e4d3e0..be39e4d3e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
index ebe4ef2dbc..ebe4ef2dbc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
index 35866938d6..35866938d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java
index 2978e8e823..2978e8e823 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index 51e1e69b5d..51e1e69b5d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java
index b990cf5980..b990cf5980 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
index 84734b88db..84734b88db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
index 9c529eecfc..9c529eecfc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java
index fc6e44d8d6..fc6e44d8d6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
index f531c2c4ed..f531c2c4ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c3af0902a3..c3af0902a3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
index a406ea21c3..a406ea21c3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index 656b78b717..656b78b717 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 6b59b498fc..6b59b498fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
index 1b28373f5b..1b28373f5b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
index 3e537df732..3e537df732 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
index bc9e4f6aaf..bc9e4f6aaf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/osgitest.composite
index 8c59703724..8c59703724 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/META-INF/MANIFEST.MF
index 801258d85c..801258d85c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/README b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/README
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/pom.xml
index f2f27fd841..f2f27fd841 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
index 6d29e21024..6d29e21024 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/META-INF/MANIFEST.MF
index 1cb55b33db..1cb55b33db 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/README b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/README
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/pom.xml
index 3a32659148..3a32659148 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 8081fb4911..8081fb4911 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
index 5dfdbffd84..5dfdbffd84 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
index 0cd85d1e33..0cd85d1e33 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 501eb945d8..501eb945d8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b04b952fae..b04b952fae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 28bd31ca11..28bd31ca11 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
index d03e42a7a2..d03e42a7a2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/LICENSE
index fa1256bf99..fa1256bf99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF
index 25c648a0ce..25c648a0ce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/NOTICE
index e158926510..e158926510 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/pom.xml
index 3c929df9d7..3c929df9d7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
index f688e103cd..f688e103cd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
index efddb002c1..efddb002c1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
index 0917804d65..0917804d65 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 12122b83e9..12122b83e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/LICENSE
index f602cf9395..f602cf9395 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF
index 47adbca335..47adbca335 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/NOTICE
index d989435591..d989435591 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/pom.xml
index 850ebff6c2..850ebff6c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
index 3862889f27..3862889f27 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
index ef1e6cd1b9..ef1e6cd1b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
index 8a9ce93204..8a9ce93204 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF
index 89d94b69fa..89d94b69fa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/pom.xml
index 14d0899b4e..14d0899b4e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
index 29c497485f..29c497485f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
index e984577cb4..e984577cb4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
index 3723ec57f2..3723ec57f2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 7881092890..7881092890 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ee5f312b8f..ee5f312b8f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-2.x/tags/2.0-M4/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
index 864318b22e..864318b22e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 4fa91e0b45..4fa91e0b45 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/pom.xml
index 8ea3f1b5c2..8ea3f1b5c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
index 56a753f4ff..56a753f4ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 494617f988..494617f988 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/interface-java/META-INF/MANIFEST.MF
index 65e69260bd..65e69260bd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/interface-java/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/interface-java/pom.xml
index 6090424ce0..6090424ce0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 1e36b95da3..1e36b95da3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 0a2edb02c7..0a2edb02c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index c849a1acfa..c849a1acfa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e6cb35cc4b..e6cb35cc4b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index e903783300..e903783300 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 2a9e3c5329..2a9e3c5329 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 75816b1d36..75816b1d36 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 519ce7b36f..519ce7b36f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7f133c0ba7..7f133c0ba7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
index 3aef8f69ac..3aef8f69ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index ffc38c7f04..ffc38c7f04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index bf58f29447..bf58f29447 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/META-INF/MANIFEST.MF
index b88aa2a141..b88aa2a141 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/pom.xml
index 1cc1526668..1cc1526668 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index 90f846b2fc..90f846b2fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index f863ff696d..f863ff696d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index a223b5cbd7..a223b5cbd7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 3612fa7756..3612fa7756 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 8c4a986525..8c4a986525 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 4351c2ac54..4351c2ac54 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 08fa2b7474..08fa2b7474 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
index 11756711be..11756711be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index 4172eb2955..4172eb2955 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index fcdf69594b..fcdf69594b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index 35052dfd6d..35052dfd6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
index 813d9e8291..813d9e8291 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/name.xsd b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/interface-wsdl/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/interface-wsdl/src/test/resources/xsd/name.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/launcher/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/launcher/META-INF/MANIFEST.MF
index a8c4d91321..a8c4d91321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/launcher/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/launcher/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/launcher/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/launcher/pom.xml
index 94aef6bb28..94aef6bb28 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/launcher/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java b/sca-java-2.x/tags/2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
index 84affffc46..84affffc46 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/monitor/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/monitor/META-INF/MANIFEST.MF
index ff4e54dd82..ff4e54dd82 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/monitor/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/monitor/pom.xml
index dbdc8ef0d9..dbdc8ef0d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
index 8a99fa4c7c..8a99fa4c7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index 0f4e7d71ff..0f4e7d71ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 12ac7eba7b..12ac7eba7b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
index 3c8fa80fc3..3c8fa80fc3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
index 6e44b2d5d9..6e44b2d5d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/myfaces/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/myfaces/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/myfaces/META-INF/MANIFEST.MF
index 2b52b751b9..2b52b751b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/myfaces/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/myfaces/pom.xml
index 707829be30..707829be30 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java b/sca-java-2.x/tags/2.0-M4/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
index b1ef8eb3ed..b1ef8eb3ed 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
index 4a05fa5856..4a05fa5856 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/node-api/META-INF/MANIFEST.MF
index 5e9e481abd..5e9e481abd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/node-api/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/node-api/pom.xml
index 58f30eac6a..58f30eac6a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
index 3c740d89a4..3c740d89a4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
index c45415f153..c45415f153 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index a351b7b074..a351b7b074 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
index 53b2bca3f9..53b2bca3f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
index 6ffdde2634..6ffdde2634 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
index 05ed360d75..05ed360d75 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
index 3d5cb1a94c..3d5cb1a94c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/META-INF/MANIFEST.MF
index 3eae6468a1..3eae6468a1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/NOTICE
index 6f390de5e6..6f390de5e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/pom.xml
index 34d97f8ed4..34d97f8ed4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
index 09e32ccc56..09e32ccc56 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointDescription.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointDescription.java
index 23a91b89ef..23a91b89ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointDescription.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointDescription.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
index 316cac081b..316cac081b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
index 74f913583e..74f913583e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
index 0e747293cb..0e747293cb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
index 0346902383..0346902383 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
index afc3355c38..afc3355c38 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
index dade67c096..dade67c096 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
index d0eda01f6e..d0eda01f6e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
index 40f68a4ba8..40f68a4ba8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java
index 7c9cf8ef6e..7c9cf8ef6e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
index d50d1ef9f9..d50d1ef9f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
index a649dac357..a649dac357 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java
index 58d72f389f..58d72f389f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java
index d085bd282d..d085bd282d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java
index a4b51d9d0c..a4b51d9d0c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java
index 479ae54e42..479ae54e42 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java
index c869ab8c14..c869ab8c14 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
index 9da7b5f014..9da7b5f014 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java
index 1967fa6e4a..1967fa6e4a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
index 5b0b311d7a..5b0b311d7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
index bf70c98634..bf70c98634 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
index 11dcd56272..11dcd56272 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
index cf1b78931a..cf1b78931a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 0960938086..0960938086 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 268f16bc9f..268f16bc9f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index 2af5552279..2af5552279 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
index 619dcaa07d..619dcaa07d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
index b14b3516f6..b14b3516f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 0dc812c503..0dc812c503 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index bc9e4f6aaf..bc9e4f6aaf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 1ae44d0a0b..1ae44d0a0b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
index 16a33f4f65..16a33f4f65 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index 72e2c339f1..72e2c339f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index 253f7d0df1..253f7d0df1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
index b14b3516f6..b14b3516f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/sca-java-2.x/tags/2.0-M4/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
index 43f101e799..43f101e799 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/node-impl/META-INF/MANIFEST.MF
index cd4afe6871..cd4afe6871 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/node-impl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl/pom.xml
index d85558441b..d85558441b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
index 78f4fabb20..78f4fabb20 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/CompositeContextImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/CompositeContextImpl.java
index 604bb502f9..604bb502f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/CompositeContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/CompositeContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index e4e2386667..e4e2386667 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 4be947f125..4be947f125 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index aa7933630a..aa7933630a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
index 5a47465702..5a47465702 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/HelloWorld.composite
index efe43cbf2f..efe43cbf2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1149eb5cbf..1149eb5cbf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
index 5b2835c434..5b2835c434 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 359daed2cc..359daed2cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/pom.xml
index db366253ce..db366253ce 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index fd4d0ee5bf..fd4d0ee5bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 79aedc81c4..79aedc81c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 939372d782..939372d782 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
index 400fdc58e8..400fdc58e8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/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-M4-RC3/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-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
index b3e9d79d28..b3e9d79d28 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/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-M4/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-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 8232acb658..8232acb658 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/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-M4-RC3/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/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-M4-RC3/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/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-M4-RC3/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/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-M4-RC3/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index ccd116e848..ccd116e848 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF
index ef73723b48..ef73723b48 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/pom.xml
index dfd52904cc..dfd52904cc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index d8df30377b..d8df30377b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/META-INF/MANIFEST.MF
index f25e5d43d3..f25e5d43d3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/pom.xml
index ea6b25c37f..ea6b25c37f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java
index be9a05982f..be9a05982f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index 0c20d1fa84..0c20d1fa84 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 6ca5732e7a..6ca5732e7a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 95c976ba49..95c976ba49 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/policy-security/META-INF/MANIFEST.MF
index 2a4e4b3205..2a4e4b3205 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/policy-security/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-security/pom.xml
index 0f45ef1ec6..0f45ef1ec6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 9b894101ef..9b894101ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 189866a23f..189866a23f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index d4d8e59429..d4d8e59429 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 39f70c7e78..39f70c7e78 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index b640ec60e5..b640ec60e5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
index 147b863c01..147b863c01 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index 8b0bbd54ff..8b0bbd54ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index 2783a37316..2783a37316 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 28ffcaf348..28ffcaf348 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index 1297b44b93..1297b44b93 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 6666469b75..6666469b75 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb284822ac..cb284822ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d3d8f8e38a..d3d8f8e38a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 9a02731e8d..9a02731e8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index f3af5bc964..f3af5bc964 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index ebb47f2b60..ebb47f2b60 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 0d8a5d5a9c..0d8a5d5a9c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index acb47de243..acb47de243 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/policy-xml-ws/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/META-INF/MANIFEST.MF
index a143352a90..a143352a90 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/pom.xml
index 58070155e6..58070155e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
index 760ce7c8da..760ce7c8da 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0ef04d5e41..0ef04d5e41 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
index 8e904615c8..8e904615c8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
index 954ae00d42..954ae00d42 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index 47cf0e5c2f..47cf0e5c2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index a2e321068f..a2e321068f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/pom.xml
index 16be25e0f6..16be25e0f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/sca-api/LICENSE
index de4b130f35..de4b130f35 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/sca-api/META-INF/MANIFEST.MF
index 2120e72d06..2120e72d06 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/sca-api/NOTICE
index 6f390de5e6..6f390de5e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/sca-api/pom.xml
index 49cfd31274..49cfd31274 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
index 740003fc12..740003fc12 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index 261b9baaf1..261b9baaf1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
index 0076ad34c0..0076ad34c0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
index 51a4dbe3ad..51a4dbe3ad 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
index 62d1b07f23..62d1b07f23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
index d12648a795..d12648a795 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/SCARuntimeException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/SCARuntimeException.java
index ed957cff6d..ed957cff6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/SCARuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/SCARuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
index d89ed54d10..d89ed54d10 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
index 70c429dcc2..70c429dcc2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
index 39cd6b1cac..39cd6b1cac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
index d394a64f91..d394a64f91 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
index 483fe2f293..483fe2f293 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
index 76fcd866ae..76fcd866ae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
index 03598e10d0..03598e10d0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
index 7debe2ba89..7debe2ba89 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
index 5481a988b6..5481a988b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
index c1c99de683..c1c99de683 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
index fce0334792..fce0334792 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
index f9c6505648..f9c6505648 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
index a8e415a00b..a8e415a00b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
index b8b38a1088..b8b38a1088 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
index 14cd5ec005..14cd5ec005 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
index 54a1935859..54a1935859 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
index b12050a3e3..b12050a3e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
index 7115e8a5e9..7115e8a5e9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
index d0825cd8e3..d0825cd8e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
index b5ff494ca2..b5ff494ca2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
index 700e71990c..700e71990c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
index 69f5828045..69f5828045 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
index 5905946627..5905946627 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
index 97204fdf32..97204fdf32 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
index 8f7d6b2043..8f7d6b2043 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
index 3f7ac2623a..3f7ac2623a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index 08eb0a8935..08eb0a8935 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
index 8f9a13430e..8f9a13430e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
index a60754762e..a60754762e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClient.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClient.java
index 907330e93b..907330e93b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClient.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
index e96969c99d..e96969c99d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
index 5137f8a658..5137f8a658 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinder.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/META-INF/MANIFEST.MF
index c121ce7830..c121ce7830 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/pom.xml
index bf019910f1..bf019910f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
index ba8d6793e2..ba8d6793e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory b/sca-java-2.x/tags/2.0-M4/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
index 3a90a22a85..3a90a22a85 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/stripes/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/stripes/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/stripes/META-INF/MANIFEST.MF
index 0fe5e58281..0fe5e58281 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/stripes/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/stripes/pom.xml
index e3bbca43af..e3bbca43af 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
index f4d7f48dae..f4d7f48dae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
index 1381266c9e..1381266c9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
index 4c73f28a08..4c73f28a08 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/wicket/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/wicket/META-INF/MANIFEST.MF
index 0fe5e58281..0fe5e58281 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/wicket/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/wicket/pom.xml
index 8fc366e3e3..8fc366e3e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java
index 589c240b84..589c240b84 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/IContextLocator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java
index b1e9097cdf..b1e9097cdf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyComponentInjector.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java
index f2814fbcbe..f2814fbcbe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyFieldValueFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java
index 03c44d96f6..03c44d96f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/wicket/src/main/java/org/apache/tuscany/sca/wicket/TuscanyInjector.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/LICENSE b/sca-java-2.x/tags/2.0-M4/modules/xsd/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/modules/xsd/META-INF/MANIFEST.MF
index b8bb9642f1..b8bb9642f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/NOTICE b/sca-java-2.x/tags/2.0-M4/modules/xsd/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/pom.xml b/sca-java-2.x/tags/2.0-M4/modules/xsd/pom.xml
index 3ccc10e72d..3ccc10e72d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
index 92dce98fa1..92dce98fa1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
index 08a1c8dd63..08a1c8dd63 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
index f9bf627655..f9bf627655 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index 63ecf5d56f..63ecf5d56f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
index ab50456510..ab50456510 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/test/resources/xsd/greeting.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/test/resources/xsd/name.xsd b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/modules/xsd/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/tags/2.0-M4/modules/xsd/src/test/resources/xsd/name.xsd
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/pom.xml b/sca-java-2.x/tags/2.0-M4/pom.xml
index bff90abffa..bff90abffa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/README b/sca-java-2.x/tags/2.0-M4/samples/README
index 4ccefa3695..4ccefa3695 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/README b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/README
index fb5afcc7ec..fb5afcc7ec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/build.xml
index e13ec494b0..e13ec494b0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/calculator.png b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/calculator.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/pom.xml
index 67cdee5815..67cdee5815 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
index 7e5ff160f0..7e5ff160f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
index 6620f6a5e7..6620f6a5e7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/sample/SampleClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
index 000c108934..000c108934 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/resources/Calculator.composite
index 29dd7e3b6f..29dd7e3b6f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 8f6b5e4845..8f6b5e4845 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/build-common.xml b/sca-java-2.x/tags/2.0-M4/samples/build-common.xml
index 64d23d3793..64d23d3793 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/build-common.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/build-common.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/README b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/README
index 7f76542622..7f76542622 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/build.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/build.xml
index 75c4839cfa..75c4839cfa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/calculator.png b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/calculator.svg b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/calculator.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/pom.xml
index 78c4f2c0e2..78c4f2c0e2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
index b49e1da130..b49e1da130 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/README b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/README
index 332526d43a..332526d43a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/build.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/pom.xml
index 35a302e68b..35a302e68b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 9d9b0a9ffb..9d9b0a9ffb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/README b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/README
index 07b6dd9713..07b6dd9713 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/build.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/build.xml
index e95ad1610b..e95ad1610b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/pom.xml
index 01166487f9..01166487f9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index e14cc3dd13..e14cc3dd13 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index a5510954e0..a5510954e0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/README b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/README
index 144881134b..144881134b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/build.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/build.xml
index a0889ccc8a..a0889ccc8a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/pom.xml
index f3f8ed5644..f3f8ed5644 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index b77015bcae..b77015bcae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 02614ad6e1..02614ad6e1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/README b/sca-java-2.x/tags/2.0-M4/samples/calculator/README
index 56c22d9c89..56c22d9c89 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/build.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator/build.xml
index 4411cae659..4411cae659 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/calculator.png b/sca-java-2.x/tags/2.0-M4/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/calculator.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator/pom.xml
index 8c0a29be3b..8c0a29be3b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 03fc56ceb3..03fc56ceb3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/resources/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 73c7d872b9..73c7d872b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index 72e2c339f1..72e2c339f1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index 253f7d0df1..253f7d0df1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/README b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/README
index e533bfcdb6..e533bfcdb6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/pom.xml
index 883eb22bbe..883eb22bbe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index 16a33f4f65..16a33f4f65 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/LICENSE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/NOTICE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 769bcdd14d..769bcdd14d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index 481fd67e09..481fd67e09 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/README b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/README
index d8aa13497a..d8aa13497a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/pom.xml
index 9865570638..9865570638 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b14b3516f6..b14b3516f6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4dd713ecef..4dd713ecef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index b00f05ad2d..b00f05ad2d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/README
index 1e8626dfec..1e8626dfec 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml
index 71cd14113c..71cd14113c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/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-M4-RC3/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/NOTICE
index 51042eab05..51042eab05 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ac73ea98f0..ac73ea98f0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index 878ef9c18e..878ef9c18e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/README b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/README
index 04fc30c0be..04fc30c0be 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/pom.xml
index 53063357a2..53063357a2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/build.xml b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/build.xml
index 008953e63b..008953e63b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/pom.xml
index 611c632bf2..611c632bf2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index e2d69eddf6..e2d69eddf6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index b95468acd8..b95468acd8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index 19afe61fd3..19afe61fd3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 603cc17af9..603cc17af9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 12e40d334b..12e40d334b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/README b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/README
index 28eccbdebb..28eccbdebb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/build.xml
index 050540a93a..050540a93a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/calculator.png b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/calculator.png
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/calculator.svg b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/calculator.svg
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/calculator.svg
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/pom.xml
index 590fa6f6ea..590fa6f6ea 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/resources/Calculator.composite
index 9450558145..9450558145 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 461c970373..461c970373 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/logging.properties b/sca-java-2.x/tags/2.0-M4/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/logging.properties
+++ b/sca-java-2.x/tags/2.0-M4/samples/logging.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/pom.xml
index a71224944d..a71224944d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/pom.xml
index 6c80b939e3..6c80b939e3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 3ffe604ef7..3ffe604ef7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/README b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/pom.xml
index 09dddbd07d..09dddbd07d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index 5c52638661..5c52638661 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/pom.xml
index 32799fbf46..32799fbf46 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index c59c7a8f6d..c59c7a8f6d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/pom.xml
index 9917a2c880..9917a2c880 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/pom.xml
index 22d399f4cd..22d399f4cd 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/README b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/README
index 00568d9bb0..00568d9bb0 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/README
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/README
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/pom.xml
index ce70092d3d..ce70092d3d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
index 8c84b4f372..8c84b4f372 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
index 31ff956185..31ff956185 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
index 7e33b15efc..7e33b15efc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
index d4441c0ab8..d4441c0ab8 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/resources/rest.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite
index 7f76f5946d..7f76f5946d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/resources/rest.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/resources/rest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
index 745164bf8d..745164bf8d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
index 9fc16372b3..9fc16372b3 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
index 3a670696e4..3a670696e4 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/style.css b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css
index 0f1cea3aaf..0f1cea3aaf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/src/main/webapp/style.css
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/src/main/webapp/style.css
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/target/classes/rest.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite
index 70b83fd986..70b83fd986 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-rest/target/classes/rest.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-rest/target/classes/rest.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/pom.xml
index e979a251c7..e979a251c7 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/pom.xml
index 0ae346e2cf..0ae346e2cf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 875d6aae9d..875d6aae9d 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/pom.xml
index af11fa2cba..af11fa2cba 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
index 61eb207e23..61eb207e23 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
index 061f4c58ae..061f4c58ae 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
index fdd91b0933..fdd91b0933 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
index e7d864c5e6..e7d864c5e6 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
index 85f2c00dbc..85f2c00dbc 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
index 1e24577860..1e24577860 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
index a52d6b6cbe..a52d6b6cbe 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
index 3783b7bf82..3783b7bf82 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/pom.xml
index 618c941e5a..618c941e5a 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
index 8d220029a5..8d220029a5 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index 045aa4674f..045aa4674f 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index d7b237641c..d7b237641c 100644
--- a/sca-java-2.x/tags/2.0-M4-RC3/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M4/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml