Rename beta3 tag to final name

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

374 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/pom.xml
index 833bfc4c28..833bfc4c28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
index ce6a9514af..ce6a9514af 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
index 7f9ed9612f..7f9ed9612f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index 3bf4e0bc30..3bf4e0bc30 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/pom.xml
index d15d120494..d15d120494 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
index ac6e94ca21..ac6e94ca21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/jndi.properties
index 7f82eb48d3..7f82eb48d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
index fcda648f1c..fcda648f1c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 28e0b530c1..28e0b530c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/pom.xml
index 6f63cb99d4..6f63cb99d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index f90db55dda..f90db55dda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index cec4e6fa6d..cec4e6fa6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
index 68c3bfa4e0..68c3bfa4e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/jndi.properties
index b8c4b1c6aa..b8c4b1c6aa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
index 64d45f1816..64d45f1816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index f9bccedfe9..f9bccedfe9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index 1661a4614c..1661a4614c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 5897df6784..5897df6784 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/pom.xml
index b674531e96..b674531e96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
index f4da034c55..f4da034c55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
index ebafbb6bcd..ebafbb6bcd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
index 5354afb130..5354afb130 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/jndi.properties
index c8b186a83c..c8b186a83c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index d2b1a5fe59..d2b1a5fe59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/pom.xml
index f91c1f2812..f91c1f2812 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
index a57e5befe2..a57e5befe2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
index 6e478e067d..6e478e067d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/jndi.properties
index d7f64fda62..d7f64fda62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 729ad072b7..729ad072b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/pom.xml
index 35994a318b..35994a318b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
index 865bb39b4c..865bb39b4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 42e33330d7..42e33330d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index b266517282..b266517282 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/pom.xml
index 107b962e51..107b962e51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 02426936d2..02426936d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
index 53504398bf..53504398bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 86451dcf02..86451dcf02 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
index dce41b86ac..dce41b86ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
index f7875b52a2..f7875b52a2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 9d3a55754c..9d3a55754c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/pom.xml
index 702f736d2f..702f736d2f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
index 5883e9a2d8..5883e9a2d8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
index e27e3818f8..e27e3818f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
index d5ab03e688..d5ab03e688 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index 53acb22e64..53acb22e64 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/pom.xml
index 744b6000bb..744b6000bb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index cdd079810e..cdd079810e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 49cb0a69ab..49cb0a69ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/pom.xml
index 262fe94298..262fe94298 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index f74ab86a14..f74ab86a14 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index 53498ce44d..53498ce44d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/pom.xml
index 96de5b66f8..96de5b66f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index 56285ad234..56285ad234 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index 78c0239f0d..78c0239f0d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/pom.xml
index b6c7182ba9..b6c7182ba9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index 48608ba9b3..48608ba9b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
index f72ce434fa..f72ce434fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index f47031da10..f47031da10 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/pom.xml
index 5d5fe82e51..5d5fe82e51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 04d4a02462..04d4a02462 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index 7950309b07..7950309b07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index a2bfc0ca8a..a2bfc0ca8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/pom.xml
index 964a273781..964a273781 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index a9e8782f94..a9e8782f94 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index b887aa18fd..b887aa18fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/pom.xml
index fa8bb80ce6..fa8bb80ce6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index fe200e3cbe..fe200e3cbe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index 80624ee770..80624ee770 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index c15d99550e..c15d99550e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
index ac68c85fd5..ac68c85fd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 6054050a5d..6054050a5d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index c0e64026a0..c0e64026a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 7bb33ae270..7bb33ae270 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 9f955c278a..9f955c278a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
index 7c1cce6087..7c1cce6087 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
index 3d41f656f9..3d41f656f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 79dd18b027..79dd18b027 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 27077cb3c9..27077cb3c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/pom.xml
index f01f7721d9..f01f7721d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
index decff8708f..decff8708f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
index 03690b1169..03690b1169 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 67d5038a51..67d5038a51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 54cfdeb273..54cfdeb273 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/pom.xml
index 38648dcfda..38648dcfda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
index 16825fe48f..16825fe48f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/service.composite
index a712990a9b..a712990a9b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
index 848e340181..848e340181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/pom.xml
index b2f050b852..b2f050b852 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 7fed36fa77..7fed36fa77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 7ab6019fd5..7ab6019fd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 89758becff..89758becff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
index ccb52c8702..ccb52c8702 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/jndi.properties
index 4bada514fa..4bada514fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/nulls.composite
index 1aa17808bf..1aa17808bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/nulls.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
index ac872f46a6..ac872f46a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/pom.xml
index 5c0a04c359..5c0a04c359 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index bf709776df..bf709776df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index da2e6a2264..da2e6a2264 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 5d1f764382..5d1f764382 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/pom.xml
index a76fff963b..a76fff963b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
index 8bccf22bea..8bccf22bea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
index 0014b88050..0014b88050 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 14bbf238e1..14bbf238e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/pom.xml
index a9955901c9..a9955901c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
index 7e417723f2..7e417723f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
index f0b9fbd734..f0b9fbd734 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index 68f93669ec..68f93669ec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index ebffbc4bc4..ebffbc4bc4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/pom.xml
index cf09350d9b..cf09350d9b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/pom.xml
index 5a3af4944c..5a3af4944c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/jndi.properties
index c44da27df1..c44da27df1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/properties/properties.composite
index 85babc8634..85babc8634 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/properties/properties.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index e8d748bb19..e8d748bb19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/pom.xml
index 2447325fe9..2447325fe9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
index a3e5403432..a3e5403432 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
index cd04ae7836..cd04ae7836 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
index 03b834ce7d..03b834ce7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/pom.xml
index f0d6bc469a..f0d6bc469a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/client.composite
index a758389e89..a758389e89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index 3c0eb0791b..3c0eb0791b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/pom.xml
index a55f7523d0..a55f7523d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
index 0592194b21..0592194b21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
index 2d4ff0192b..2d4ff0192b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
index b632b3f60f..b632b3f60f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
index b2df9137c8..b2df9137c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
index 0b24678543..0b24678543 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
index 0ce66005fc..0ce66005fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
index 7e42113da4..7e42113da4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
index 724de6ff7c..724de6ff7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
index 3527e98032..3527e98032 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index d8c9d051ba..d8c9d051ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index a3f1d0825b..a3f1d0825b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jndi.properties
index 7ce468aa0f..7ce468aa0f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index 1a408dfb9a..1a408dfb9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
index bee0c549bd..bee0c549bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index 33e047ae18..33e047ae18 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index e7254005be..e7254005be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/pom.xml
index b739a30d4f..b739a30d4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
index c1156b35e6..c1156b35e6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/jndi.properties
index d7988ee60d..d7988ee60d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index d4027ff60d..d4027ff60d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index 8726543253..8726543253 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index 35fe96b81a..35fe96b81a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/pom.xml
index d88996a38a..d88996a38a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
index dc6577b7e1..dc6577b7e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 4f9908f062..4f9908f062 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
index ff50ad2daa..ff50ad2daa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/jndi.properties
index 7ac9aa559c..7ac9aa559c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/ttl.composite
index 8b06a9fc7c..8b06a9fc7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/ttl.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/ttl.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
index b5839f4c4f..b5839f4c4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/pom.xml
index e5285cf88d..e5285cf88d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
index 655372580c..655372580c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
index f6dfc8e9d0..f6dfc8e9d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
index 99ed243196..99ed243196 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 8295fb10c9..8295fb10c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index 60b0f0a1a3..60b0f0a1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java