259 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/README
index cf635e78d0..cf635e78d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index 654fe3941c..654fe3941c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
index e712ec8b53..e712ec8b53 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
index d09b2af230..d09b2af230 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
index 652f7b53c4..652f7b53c4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
index 85e55888c6..85e55888c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index 51f6dd4d51..51f6dd4d51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 67236a5f98..67236a5f98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
index 0188dc0d41..0188dc0d41 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index f133cdfdef..f133cdfdef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
index 7c63fd5ba9..7c63fd5ba9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
index 78d8077bcd..78d8077bcd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
index 0e6a10cc62..0e6a10cc62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
index 0cd2b4419d..0cd2b4419d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/pom.xml
index 88fede5974..88fede5974 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index da40a7f442..da40a7f442 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
index 11ed0a3353..11ed0a3353 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
index 3c347570a0..3c347570a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/pom.xml
index 94c79059c1..94c79059c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
index 796ef82792..796ef82792 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
index ba7e033f63..ba7e033f63 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/pom.xml
index 12c3506a82..12c3506a82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
index 3c14218118..3c14218118 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
index a69fe483bf..a69fe483bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/pom.xml
index 1267b5c594..1267b5c594 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/README
index 0efac242c2..0efac242c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml
index 5f1222a8f3..5f1222a8f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 885844260a..885844260a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d4e651b271..d4e651b271 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 166565baa0..166565baa0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index 380fc5b0f5..380fc5b0f5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index 26765da5fa..26765da5fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
index 2be7fd7315..2be7fd7315 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 440db09733..440db09733 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
index 31414beb47..31414beb47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/pom.xml
index 785c32b31c..785c32b31c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
index 0d66bb105f..0d66bb105f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
index e522c6c151..e522c6c151 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
index aea84ad56e..aea84ad56e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/pom.xml
index fa0ef20f6c..fa0ef20f6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
index cb257d22dd..cb257d22dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index 4d59bb0f37..4d59bb0f37 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index 27471f87c6..27471f87c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index 6f3b430d6d..6f3b430d6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
index f5a25b39f8..f5a25b39f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
index 545820a07d..545820a07d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
index e00e130c32..e00e130c32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/pom.xml
index 3e8085404f..3e8085404f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 9196530db7..9196530db7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index c8bad91339..c8bad91339 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index deb4dfc09d..deb4dfc09d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
index e37ff1aef3..e37ff1aef3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
index 03e0a8c93c..03e0a8c93c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
index 6238bf2f45..6238bf2f45 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
index 5ae9e78823..5ae9e78823 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/pom.xml
index 0a1dd1f555..0a1dd1f555 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 8f57680d47..8f57680d47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
index e6cdb94dfb..e6cdb94dfb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/README
index fe73646e78..fe73646e78 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/pom.xml
index e135e52510..e135e52510 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index 9ee8373468..9ee8373468 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index 6f3b430d6d..6f3b430d6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
index 0c11e6a8f4..0c11e6a8f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
index 8841f0dcf2..8841f0dcf2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
index 28dedef44c..28dedef44c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/pom.xml
index c1c2c6f683..c1c2c6f683 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index c9c1038ea3..c9c1038ea3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index d88a765682..d88a765682 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
index 59fce9d849..59fce9d849 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
index 2d8adf3d73..2d8adf3d73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index 467eeb90c5..467eeb90c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
index c38f629e4f..c38f629e4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
index 8d0c7bf9ff..8d0c7bf9ff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/pom.xml
index 5c8d9552bf..5c8d9552bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
index a1233f6d25..a1233f6d25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
index 0695ace7f4..0695ace7f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index f39566ccbf..f39566ccbf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
index 332f825a51..332f825a51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 3bbf50a728..3bbf50a728 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
index cae74697f1..cae74697f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
index 1e4c1fcbff..1e4c1fcbff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/pom.xml
index fcbea91dc1..fcbea91dc1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
index 4ba7e67de2..4ba7e67de2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
index 1b0af55874..1b0af55874 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
index f1cfe30475..f1cfe30475 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/pom.xml
index c630b61316..c630b61316 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
index 8f77c63213..8f77c63213 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
index 9d0a4ce5b4..9d0a4ce5b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
index c7863a5ff8..c7863a5ff8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
index 63c6a89cfb..63c6a89cfb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
index 9991a415f9..9991a415f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
index 1ea7ab5a36..1ea7ab5a36 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
index bad94bbbc3..bad94bbbc3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
index 4ecf016e5a..4ecf016e5a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
index 13163d62ab..13163d62ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
index bb492557d4..bb492557d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
index e038cc3116..e038cc3116 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/pom.xml
index cc29fd85c6..cc29fd85c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index ccecf5695f..ccecf5695f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
index d175589d7b..d175589d7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
index c9c0acb038..c9c0acb038 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/pom.xml
index 849931cd8a..849931cd8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
index 1f330aa441..1f330aa441 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
index 1b22153169..1b22153169 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
index 129365b5e4..129365b5e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
index 3a6266f1ef..3a6266f1ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
index 67734bd676..67734bd676 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
index 2a4bb26858..2a4bb26858 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
index 718be0b46d..718be0b46d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
index b607250806..b607250806 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
index 31af9e19f9..31af9e19f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
index 05b8538c2a..05b8538c2a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
index d14269fde2..d14269fde2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
index 8ec9a94248..8ec9a94248 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
index 83b198ab35..83b198ab35 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
index 8a563666c8..8a563666c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
index 9d7d052472..9d7d052472 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
index 5da7e870ed..5da7e870ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
index f762709a4c..f762709a4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/README
index 41dcb8680b..41dcb8680b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/pom.xml
index 0e83678e76..0e83678e76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 3662007984..3662007984 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d7251590ba..d7251590ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index aa21221b30..aa21221b30 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
index d67bccdf8b..d67bccdf8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
index d58f761b79..d58f761b79 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/pom.xml
index 0f9f97e008..0f9f97e008 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
index aaf9504116..aaf9504116 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
index a8980c8031..a8980c8031 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
index 8c26e5c54a..8c26e5c54a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
index 3bd65d549a..3bd65d549a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
index a7fb6d6125..a7fb6d6125 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
index 95e61ccc1b..95e61ccc1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
index 77418f331f..77418f331f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
index 9f74dd47b8..9f74dd47b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
index 7ed4829d85..7ed4829d85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/pom.xml
index 823689b6c9..823689b6c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
index d349e450c2..d349e450c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
index 0e0e6e93ba..0e0e6e93ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
index 09697f82ba..09697f82ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
index 49ba20c20b..49ba20c20b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
index a85007e019..a85007e019 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
index 0aa6a71db4..0aa6a71db4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
index c8566bfa3b..c8566bfa3b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/pom.xml
index 1f27d5cce8..1f27d5cce8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/pom.xml
index 680e4e7b2d..680e4e7b2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
index 963712c0c2..963712c0c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
index ab5fc0f873..ab5fc0f873 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
index 6f6a374450..6f6a374450 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
index 805a515382..805a515382 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
index 2479f3dbe5..2479f3dbe5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
index 24cf3eebad..24cf3eebad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
index b78909142f..b78909142f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
index c520d2e3b2..c520d2e3b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
index 29be66fb71..29be66fb71 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
index 686b08a1d4..686b08a1d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
index 105c82a411..105c82a411 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
index 7a7a4033ce..7a7a4033ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
index 65270b8d6c..65270b8d6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
index 02395c4615..02395c4615 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
index 6b06cec722..6b06cec722 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
index bc69473abe..bc69473abe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
index e48e1bc050..e48e1bc050 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
index 173d952b0e..173d952b0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
index 635c49b8ab..635c49b8ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/README
index 60a1b09598..60a1b09598 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/pom.xml
index a8319557c8..a8319557c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 057b00a21c..057b00a21c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 212617af6a..212617af6a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index b1ecba682b..b1ecba682b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
index 4ada132172..4ada132172 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
index e2184ad3c6..e2184ad3c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index 95089c39f3..95089c39f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 463979ef6f..463979ef6f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index 15b89dbcea..15b89dbcea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index 610f9e4bd5..610f9e4bd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java