Rename 2.0 M3 final RC tag

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

462 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/pom.xml b/tags/java/sca/2.0-M3/itest/builder/pom.xml
index aa2f7c299a..aa2f7c299a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index a4c6e08844..a4c6e08844 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index bfc4e34644..bfc4e34644 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index eb5b5dd5c0..eb5b5dd5c0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index db1eac6787..db1eac6787 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index f4b8d2cf39..f4b8d2cf39 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 299f7606e3..299f7606e3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index d8cb23bbd3..d8cb23bbd3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/scenario1.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/scenario1.composite
index 4e58cdfa16..4e58cdfa16 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/scenario1a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 06b273c7a7..06b273c7a7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index ac01b3c687..ac01b3c687 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/scenario10.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/scenario10.composite
index 2d127a7bec..2d127a7bec 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/scenario10a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 98103e360e..98103e360e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/service3.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index 8b82b43c68..8b82b43c68 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/scenario11.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/scenario11.composite
index 2f5ca96d07..2f5ca96d07 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/scenario11a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 381ccddcc3..381ccddcc3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/service3.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 4028098023..4028098023 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/scenario12.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..23799f8487 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/scenario12a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2b4f88dc3..a2b4f88dc3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index 1da59d5f04..1da59d5f04 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/scenario13.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/scenario13.composite
index 631e38855f..631e38855f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/scenario13a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 98976dc4e8..98976dc4e8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index 6f174a4504..6f174a4504 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/scenario2.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/scenario2.composite
index 7c4eeda4bd..7c4eeda4bd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/scenario2a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/scenario2a.composite
index 5e97d7eea0..5e97d7eea0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index 22950dfe03..22950dfe03 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/scenario3.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/scenario3.composite
index 84f42c60fc..84f42c60fc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/scenario3a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/scenario3a.composite
index 18ed91142c..18ed91142c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index a17e27c9d8..a17e27c9d8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/scenario4.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/scenario4.composite
index a0bdb0197d..a0bdb0197d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/scenario4a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 1b4cf27c76..1b4cf27c76 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 83a232db6e..83a232db6e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenario5.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenario5.composite
index 2326afd2f2..2326afd2f2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenario5a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenario5a.composite
index fdf1423b66..fdf1423b66 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 776dfe4d97..776dfe4d97 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenario6.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenario6.composite
index 9575612d51..9575612d51 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenario6a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 9c7b58e2cb..9c7b58e2cb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index ede31d6bee..ede31d6bee 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenario7.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenario7.composite
index e1d2e0cefe..e1d2e0cefe 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenario7a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenario7a.composite
index ef16dc0785..ef16dc0785 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7bb9e694a3..7bb9e694a3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenario8.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenario8.composite
index 467b7f57fa..467b7f57fa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenario8a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 9d9b5ba945..9d9b5ba945 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index b6ec160506..b6ec160506 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/scenario9.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/scenario9.composite
index 83584ed482..83584ed482 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/scenario9a.composite b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 0021ec242b..0021ec242b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/tags/java/sca/2.0-M3/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index cdeb355f8b..cdeb355f8b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index da8a46067a..da8a46067a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index f4d8b094c7..f4d8b094c7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/tags/java/sca/2.0-M3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/pom.xml b/tags/java/sca/2.0-M3/itest/callback-api/pom.xml
index 6ec7074d6a..6ec7074d6a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-api/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index b013462f9f..b013462f9f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 252e4dc45f..252e4dc45f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index d883dc2d6f..d883dc2d6f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index afb7c45e2c..afb7c45e2c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index bdac56d222..bdac56d222 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/2.0-M3/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 309311e258..309311e258 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 6e049d603e..6e049d603e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/2.0-M3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 75fab95efb..75fab95efb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/pom.xml b/tags/java/sca/2.0-M3/itest/callback-basic-ws/pom.xml
index 15b5795a20..15b5795a20 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index db1a2fbf6a..db1a2fbf6a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/pom.xml b/tags/java/sca/2.0-M3/itest/callback-basic/pom.xml
index 529c79089d..529c79089d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index 87cde940e1..87cde940e1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/2.0-M3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/pom.xml b/tags/java/sca/2.0-M3/itest/callback-complex-type/pom.xml
index 66f2b7d9ec..66f2b7d9ec 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 627d37e27d..627d37e27d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 966ad17b9a..966ad17b9a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2dc0add75..d2dc0add75 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index 32ab1bdd3e..32ab1bdd3e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index f7a1a195ed..f7a1a195ed 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 2eea567fff..2eea567fff 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index af0b373472..af0b373472 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
index dde489d766..dde489d766 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/pom.xml b/tags/java/sca/2.0-M3/itest/callback-id/pom.xml
index 9907a1beb5..9907a1beb5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-id/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index 643cb3beb8..643cb3beb8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index 6e5a0c7654..6e5a0c7654 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index aaf99a534b..aaf99a534b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index cc7907f6ae..cc7907f6ae 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 4f04959b9d..4f04959b9d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/2.0-M3/itest/callback-id/src/main/resources/CallBackIdClient.composite
index a2b69afe69..a2b69afe69 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/2.0-M3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 56fd46d1b0..56fd46d1b0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/pom.xml b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/pom.xml
index f17263214f..f17263214f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index c3ea6c3032..c3ea6c3032 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index 84ca158c97..84ca158c97 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index 66758a1e73..66758a1e73 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 49df5aa17a..49df5aa17a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index ddf25b2578..ddf25b2578 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index bd3cce74b4..bd3cce74b4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/pom.xml b/tags/java/sca/2.0-M3/itest/callback-separatethread/pom.xml
index bef92719d2..bef92719d2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index dc66003604..dc66003604 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index f03144db8a..f03144db8a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index 137ea6a658..137ea6a658 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index a00578427c..a00578427c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 692ffbe8dd..692ffbe8dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index a6e2c35761..a6e2c35761 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index c216cab1be..c216cab1be 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/pom.xml b/tags/java/sca/2.0-M3/itest/callback-set-callback/pom.xml
index 5c552f1d81..5c552f1d81 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index e54b9b4004..e54b9b4004 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index f80401836e..f80401836e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index a15bcd90ae..a15bcd90ae 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 3e72b7ef3c..3e72b7ef3c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 6fd13eec5f..6fd13eec5f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 08c8b94a2f..08c8b94a2f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 78bc793c81..78bc793c81 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 274337fabc..274337fabc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 5aaf596d85..5aaf596d85 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/pom.xml b/tags/java/sca/2.0-M3/itest/callback-set-conversation/pom.xml
index f803c390be..f803c390be 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index 77837fdb77..77837fdb77 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index 825d1d6486..825d1d6486 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index b5c3e6e8b8..b5c3e6e8b8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 12a206affa..12a206affa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index bd17731fa1..bd17731fa1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index f7c718adab..f7c718adab 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 74c19961ba..74c19961ba 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index d79b9278e2..d79b9278e2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index 831e488f1b..831e488f1b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index a61682da06..a61682da06 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/pom.xml b/tags/java/sca/2.0-M3/itest/component-type/pom.xml
index 4905a77f58..4905a77f58 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/component-type/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/AddService.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/Calculator.composite
index 1245792edb..1245792edb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/Calculator.composite
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/Calculator.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 78e169deb4..78e169deb4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 5d66becedf..5d66becedf 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 22236ae0d0..22236ae0d0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2035d617e5..2035d617e5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index fe76f553be..fe76f553be 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/2.0-M3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/pom.xml b/tags/java/sca/2.0-M3/itest/contribution-folder/pom.xml
index 7a924199dd..7a924199dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index a318cf50d9..a318cf50d9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
index 0c8f84d7cc..0c8f84d7cc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index e11d44fe58..e11d44fe58 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 10140b7bc1..10140b7bc1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/tags/java/sca/2.0-M3/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/pom.xml b/tags/java/sca/2.0-M3/itest/contribution-zip/pom.xml
index 1bacaabbb2..1bacaabbb2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/contribution-zip/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
index a318cf50d9..a318cf50d9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
+++ b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
index 303e2a6d9a..303e2a6d9a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/resources/repository/contribution.zip b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 3239ae1242..3239ae1242 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ b/tags/java/sca/2.0-M3/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/pom.xml b/tags/java/sca/2.0-M3/itest/conversations/pom.xml
index c635d99d4c..c635d99d4c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/conversations/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 946ad93d7d..946ad93d7d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index 27939e3996..27939e3996 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index 7887417e55..7887417e55 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 735bcee176..735bcee176 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index 1c5d2cdbb8..1c5d2cdbb8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index cebbea0701..cebbea0701 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 9ca4abb9d3..9ca4abb9d3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 734fb9fe7b..734fb9fe7b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 99f4c85d8f..99f4c85d8f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index fb4ecb56e7..fb4ecb56e7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 21a4db737e..21a4db737e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 48c1644b87..48c1644b87 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 2c205c2cae..2c205c2cae 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 48c203ab35..48c203ab35 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 614c0a96b5..614c0a96b5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 86a96aaa75..86a96aaa75 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index b56186ea88..b56186ea88 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index f394770ffc..f394770ffc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index b94e8a6452..b94e8a6452 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index 737c2940dd..737c2940dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 8f2736ad2d..8f2736ad2d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index 8b3a8663d8..8b3a8663d8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index ae8bee8040..ae8bee8040 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3784dfd53e..3784dfd53e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 5823b7d050..5823b7d050 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index c9c5138515..c9c5138515 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 134ffda75d..134ffda75d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 73a6d7d27e..73a6d7d27e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 5bafa5e075..5bafa5e075 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8d63ebbbef..8d63ebbbef 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index ecf108c656..ecf108c656 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index ee09e99f1b..ee09e99f1b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index ad0c1fb7da..ad0c1fb7da 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index 55390189cf..55390189cf 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/ConversationAge.composite
index 12746650c7..12746650c7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 3fbffdc660..3fbffdc660 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversationId.composite
index 50ffdea701..50ffdea701 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversationId.composite
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversationId.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversationLifetime.composite
index 538e2f63fd..538e2f63fd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversational.composite
index dba9cec03f..dba9cec03f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/main/resources/conversational.composite
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/main/resources/conversational.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index e64a9acbe2..e64a9acbe2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 2b1aea3ff3..2b1aea3ff3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index f9bb69aa30..f9bb69aa30 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index a686754d3a..a686754d3a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index ee1bf84fc4..ee1bf84fc4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index 56bca7ac78..56bca7ac78 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/bin-distro-unzip/build.xml b/tags/java/sca/2.0-M3/itest/distribution/bin-distro-unzip/build.xml
index 7542fc23dd..7542fc23dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/bin-distro-unzip/build.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/bin-distro-unzip/build.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/bin-distro-unzip/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/bin-distro-unzip/pom.xml
index 9fa5f913ff..9fa5f913ff 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/bin-distro-unzip/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/binding-ws-calculator/build.xml b/tags/java/sca/2.0-M3/itest/distribution/binding-ws-calculator/build.xml
index f222a3ac0c..f222a3ac0c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/binding-ws-calculator/build.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/binding-ws-calculator/build.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/binding-ws-calculator/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/binding-ws-calculator/pom.xml
index e40d5541fb..e40d5541fb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/binding-ws-calculator/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/binding-ws-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/calculator-rmi/build.xml b/tags/java/sca/2.0-M3/itest/distribution/calculator-rmi/build.xml
index ac3bcf05d3..ac3bcf05d3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/calculator-rmi/build.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/calculator-rmi/build.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/calculator-rmi/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/calculator-rmi/pom.xml
index 1959cd4333..1959cd4333 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/calculator-rmi/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/calculator-rmi/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/implementation-java-calculator/build.xml b/tags/java/sca/2.0-M3/itest/distribution/implementation-java-calculator/build.xml
index 3ac1900c3f..3ac1900c3f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/implementation-java-calculator/build.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/implementation-java-calculator/build.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/implementation-java-calculator/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/implementation-java-calculator/pom.xml
index a34796400c..a34796400c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/implementation-java-calculator/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/implementation-java-calculator/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/legal-checks/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/legal-checks/pom.xml
index f3b4356710..f3b4356710 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/legal-checks/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/legal-checks/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/tags/java/sca/2.0-M3/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index d17fb283a9..d17fb283a9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/tags/java/sca/2.0-M3/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/pom.xml
index 91b0875b45..91b0875b45 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-bpel/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-bpel/pom.xml
index 0ea66bcde0..0ea66bcde0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-bpel/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
index 5305695987..5305695987 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-jsp/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-jsp/pom.xml
index a373eec844..a373eec844 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-jsp/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 7bcd590cf0..7bcd590cf0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-stripes/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-stripes/pom.xml
index 1d884241c0..1d884241c0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-stripes/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 4c75e312b5..4c75e312b5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld/pom.xml b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld/pom.xml
index 8c1fe33383..8c1fe33383 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/distribution/webapp-helloworld/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/distribution/webapp-helloworld/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/pom.xml b/tags/java/sca/2.0-M3/itest/exceptions/pom.xml
index 3fd1855672..3fd1855672 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/exceptions/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index 1f57116bac..1f57116bac 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 112aefc747..112aefc747 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index 53a6c70b57..53a6c70b57 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index ace219991b..ace219991b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 26b9f0a383..26b9f0a383 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index cd62338841..cd62338841 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 56b9fc6f5b..56b9fc6f5b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index c5b54ff902..c5b54ff902 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/resources/ExceptionTest.composite b/tags/java/sca/2.0-M3/itest/exceptions/src/main/resources/ExceptionTest.composite
index d42866303e..d42866303e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/tags/java/sca/2.0-M3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 7794348476..7794348476 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/pom.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/pom.xml
index d277051514..d277051514 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 833cc50f71..833cc50f71 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d6db2bd182..d6db2bd182 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/AddService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index 78eea39c71..78eea39c71 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/DivideService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 77d98d50aa..77d98d50aa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 830052ae19..830052ae19 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index 73939693a4..73939693a4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 0e2374d599..0e2374d599 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java
index 96df81fc0c..96df81fc0c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index 538d3547f4..538d3547f4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 5c9dede7ec..5c9dede7ec 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestReference.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java
index 0a8742d242..0a8742d242 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index 27ccdbdd77..27ccdbdd77 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index 881ca8bb7d..881ca8bb7d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 000b135f01..000b135f01 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/CalculatorService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/CalculatorService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 910771b34d..910771b34d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
index 3faed92fd2..3faed92fd2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/SpringHelloWorld-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
index 74473073ea..74473073ea 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
index 930b92f4be..930b92f4be 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/MANIFEST.MF
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
index 8613e6c82a..8613e6c82a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
index d18d8312e3..d18d8312e3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringExplicitReference-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
index df4b9b28cf..df4b9b28cf 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-references/SpringImplicitReference-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
index 194bc4bcc9..194bc4bcc9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringExplicitService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
index 1c63311367..1c63311367 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/sca-services/SpringImplicitService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index 8863553419..8863553419 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index 2d6705ce56..2d6705ce56 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 15c0c39f51..15c0c39f51 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 28b62dfeb9..28b62dfeb9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
index 94e4997734..94e4997734 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index d33ae8ca4b..d33ae8ca4b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index e47b6526ff..e47b6526ff 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 9099abdbeb..9099abdbeb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 42c67ffa39..42c67ffa39 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 4aa9b7a56d..4aa9b7a56d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index ae972f8647..ae972f8647 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index b259b9d657..b259b9d657 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index 8ab04edc63..8ab04edc63 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index 21f89e6a1c..21f89e6a1c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index 828e94ff65..828e94ff65 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 5feb293bc8..5feb293bc8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index e9bfaa0a1d..e9bfaa0a1d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 3940bf65fa..3940bf65fa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..75b296bf32 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index d8ecae99bd..d8ecae99bd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 3f26b8c6db..3f26b8c6db 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index efd5fd22df..efd5fd22df 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index 88ac2e8cb5..88ac2e8cb5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index e3600a355c..e3600a355c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index f93095e3c9..f93095e3c9 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 605a0079fb..605a0079fb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index e712593fe3..e712593fe3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index f75df2c75d..f75df2c75d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 32cb26979e..32cb26979e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index f8f8886f9f..f8f8886f9f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index d9522e12a0..d9522e12a0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index 1ad1779ee2..1ad1779ee2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 9bc12c3e7b..9bc12c3e7b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 52ea64a3ed..52ea64a3ed 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index 35f44b2af7..35f44b2af7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 488bdcb202..488bdcb202 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index 5a5056d91e..5a5056d91e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 3a9ec4bbb2..3a9ec4bbb2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/pom.xml b/tags/java/sca/2.0-M3/itest/interfaces/pom.xml
index 99817cb3cf..99817cb3cf 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/interfaces/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index f4131593d5..f4131593d5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 5fc9ed51b3..5fc9ed51b3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index 6cd937af12..6cd937af12 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 05a9d09bdd..05a9d09bdd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index ab0b18191c..ab0b18191c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 724d94dffb..724d94dffb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index be3fa4c15a..be3fa4c15a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index 9f34dfd274..9f34dfd274 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index 541b1f1508..541b1f1508 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index b29b298ab6..b29b298ab6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 00a0f5645b..00a0f5645b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/resources/InterfacesTest.composite b/tags/java/sca/2.0-M3/itest/interfaces/src/main/resources/InterfacesTest.composite
index 8b3d0e8f63..8b3d0e8f63 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/tags/java/sca/2.0-M3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 57ba18d0d6..57ba18d0d6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/pom.xml
index ec124f23f7..ec124f23f7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index a8e74be096..a8e74be096 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
index d55aa7ba9c..d55aa7ba9c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 81a3fa1f2d..81a3fa1f2d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-iface/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/helloworld-iface/pom.xml
index 7ee22a320d..7ee22a320d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-iface/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-iface/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/tags/java/sca/2.0-M3/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index d49ebc2cef..d49ebc2cef 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/pom.xml
index 24c4299f35..24c4299f35 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index 20233b0397..20233b0397 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
index 9c68ffd043..9c68ffd043 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 95d78b1983..95d78b1983 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/tags/java/sca/2.0-M3/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/one-node-test/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/one-node-test/pom.xml
index 2b73398afe..2b73398afe 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/one-node-test/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/one-node-test/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/tags/java/sca/2.0-M3/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 63ddc789db..63ddc789db 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/pom.xml
index 9d153681ed..9d153681ed 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/two-nodes-test/pom.xml b/tags/java/sca/2.0-M3/itest/nodes/two-nodes-test/pom.xml
index 6436ea09dc..6436ea09dc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/two-nodes-test/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/nodes/two-nodes-test/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/tags/java/sca/2.0-M3/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 8352f70e17..8352f70e17 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/pom.xml b/tags/java/sca/2.0-M3/itest/operation-overloading/pom.xml
index c72ca0ee2e..c72ca0ee2e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 1f589b44f4..1f589b44f4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index a30d3611fb..a30d3611fb 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index 9ec60eb78f..9ec60eb78f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/resources/OperationOverload.composite b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/tags/java/sca/2.0-M3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 62e5c14ce2..62e5c14ce2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/tags/java/sca/2.0-M3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/pom.xml b/tags/java/sca/2.0-M3/itest/pom.xml
index 89fbb2b4c6..89fbb2b4c6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/pom.xml b/tags/java/sca/2.0-M3/itest/properties/pom.xml
index 1ba7bc62aa..1ba7bc62aa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/properties/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 87f87d6c22..87f87d6c22 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 5217ede572..5217ede572 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 5f8f28e46a..5f8f28e46a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 7c700903d6..7c700903d6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 1d2e563095..1d2e563095 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 54082e297a..54082e297a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/package-info.java b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 24a2cca822..24a2cca822 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/Outer.composite b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/Outer.composite
index 0ada194cb3..0ada194cb3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/Outer.composite
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/Outer.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/OuterPropertyTest.composite b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/OuterPropertyTest.composite
index 75fa0aaa81..75fa0aaa81 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/PropertyTest.composite b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/PropertyTest.composite
index 4d3715dba6..4d3715dba6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/PropertyTest.composite
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/customer.xsd b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/customer.xsd
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/customer.xsd
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/fileProperty.txt b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/fileProperty.txt
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/fileProperty.txt
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/manyValuesFileProperty.txt b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/mySimpleService.composite b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/mySimpleService.composite
index b22b32bc30..b22b32bc30 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/mySimpleService.composite
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/rcProps.txt b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/rcProps.txt
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/rcProps.txt
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/rcprops.xsd b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/main/resources/rcprops.xsd
+++ b/tags/java/sca/2.0-M3/itest/properties/src/main/resources/rcprops.xsd
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index da1ec5186f..da1ec5186f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index caf5a5e052..caf5a5e052 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..a0213ced46 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/pom.xml b/tags/java/sca/2.0-M3/itest/recursive-multi-level/pom.xml
index 437fbbff44..437fbbff44 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 261eff2584..261eff2584 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index f3c9280f96..f3c9280f96 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 090bc49a41..090bc49a41 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index 8c1a9a2f72..8c1a9a2f72 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 884a8b0a96..884a8b0a96 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index b9b4e3ba7c..b9b4e3ba7c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/pom.xml b/tags/java/sca/2.0-M3/itest/references/pom.xml
index 05daa07fba..05daa07fba 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/references/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 49c3deb84d..49c3deb84d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 211e6160f6..211e6160f6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 47a1f9bde8..47a1f9bde8 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 80617bdec2..80617bdec2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index d181ac96ca..d181ac96ca 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/tags/java/sca/2.0-M3/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 5300107706..5300107706 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/InnerReferencesTest.composite b/tags/java/sca/2.0-M3/itest/references/src/main/resources/InnerReferencesTest.composite
index be4ac75b3c..be4ac75b3c 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/tags/java/sca/2.0-M3/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index d5596e3da4..d5596e3da4 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/tags/java/sca/2.0-M3/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 76264d308f..76264d308f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 6e4212fd9a..6e4212fd9a 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 6349e4f827..6349e4f827 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/pom.xml b/tags/java/sca/2.0-M3/itest/scaclient-api/pom.xml
index 0af889cdf6..0af889cdf6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/java/itest/HelloworldService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 4b9910bb21..4b9910bb21 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/resources/Helloworld.composite b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/resources/Helloworld.composite
index 0352aabfb1..0352aabfb1 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/resources/Helloworld.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
index d8604a5cc0..d8604a5cc0 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/tags/java/sca/2.0-M3/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index f8c0d9034e..f8c0d9034e 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/pom.xml b/tags/java/sca/2.0-M3/itest/scopes/pom.xml
index a154779531..a154779531 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/scopes/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 208ac3ba44..208ac3ba44 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index ff116070b5..ff116070b5 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index e6bf08ccf2..e6bf08ccf2 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/tags/java/sca/2.0-M3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/resources/scopes.composite b/tags/java/sca/2.0-M3/itest/scopes/src/main/resources/scopes.composite
index ac6de1b8bc..ac6de1b8bc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/main/resources/scopes.composite
+++ b/tags/java/sca/2.0-M3/itest/scopes/src/main/resources/scopes.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/tags/java/sca/2.0-M3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 959a6067ee..959a6067ee 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/pom.xml b/tags/java/sca/2.0-M3/itest/services/pom.xml
index e2030af889..e2030af889 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/services/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 26e58dc530..26e58dc530 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 627ff4976f..627ff4976f 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index d04bd1b985..d04bd1b985 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index 01df89a8fa..01df89a8fa 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 07397e4502..07397e4502 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index 842a85e000..842a85e000 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 8a3923b351..8a3923b351 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 59ffce8205..59ffce8205 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M3/itest/services/src/main/resources/META-INF/sca-contribution.xml
index a3c87f60c7..a3c87f60c7 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/resources/ServicesTest.composite b/tags/java/sca/2.0-M3/itest/services/src/main/resources/ServicesTest.composite
index 9b7a30d850..9b7a30d850 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/main/resources/ServicesTest.composite
+++ b/tags/java/sca/2.0-M3/itest/services/src/main/resources/ServicesTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/tags/java/sca/2.0-M3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index da779b2c54..da779b2c54 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/pom.xml b/tags/java/sca/2.0-M3/itest/wires/pom.xml
index f4e24067f3..f4e24067f3 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/pom.xml
+++ b/tags/java/sca/2.0-M3/itest/wires/pom.xml
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/tags/java/sca/2.0-M3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/resources/WireTest.composite b/tags/java/sca/2.0-M3/itest/wires/src/main/resources/WireTest.composite
index fc8f61f459..fc8f61f459 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/main/resources/WireTest.composite
+++ b/tags/java/sca/2.0-M3/itest/wires/src/main/resources/WireTest.composite
diff --git a/tags/java/sca/2.0-M3-RC5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/tags/java/sca/2.0-M3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/tags/java/sca/2.0-M3-RC5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/tags/java/sca/2.0-M3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java