Moving 2.x contribs

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

116 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/itest/jms-args/pom.xml b/sca-java-2.x/contrib/itest/jms-args/pom.xml
index dbddf929af..dbddf929af 100644
--- a/java/sca-contrib/itest/jms-args/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-args/pom.xml
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/java/sca-contrib/itest/jms-callbacks/pom.xml b/sca-java-2.x/contrib/itest/jms-callbacks/pom.xml
index ceb8d128b2..ceb8d128b2 100644
--- a/java/sca-contrib/itest/jms-callbacks/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/pom.xml
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index a4d5190af3..a4d5190af3 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index e8357338ae..e8357338ae 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/java/sca-contrib/itest/jms-definitions/pom.xml b/sca-java-2.x/contrib/itest/jms-definitions/pom.xml
index 5f594ea957..5f594ea957 100644
--- a/java/sca-contrib/itest/jms-definitions/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-definitions/pom.xml
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions.xml
index ff389c7014..ff389c7014 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/pom.xml b/sca-java-2.x/contrib/itest/jms-format/pom.xml
index d9168ee4e6..d9168ee4e6 100644
--- a/java/sca-contrib/itest/jms-format/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-format/pom.xml
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 646cecc2b7..646cecc2b7 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 25a7e36fce..25a7e36fce 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index f5596df894..f5596df894 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index f0b7819c3b..f0b7819c3b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
index 735725e9c2..735725e9c2 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
index c2c991f857..c2c991f857 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
index 2fb1c49685..2fb1c49685 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
index 72ae0a330e..72ae0a330e 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index e67f2ba8fa..e67f2ba8fa 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 21b4d0461e..21b4d0461e 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index 43e623f192..43e623f192 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index 2956df755b..2956df755b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index feee945ccd..feee945ccd 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index d266735183..d266735183 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 3444789d01..3444789d01 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index f42a1e2de1..f42a1e2de1 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e1706dbe6b..e1706dbe6b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index a58cb87714..a58cb87714 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
index ef66c5583c..ef66c5583c 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
index f487996324..f487996324 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
index f487996324..f487996324 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
index 07507e0ebe..07507e0ebe 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
index 3cd1238c79..3cd1238c79 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 3d40d4fa85..3d40d4fa85 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
index 90b74146e5..90b74146e5 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index 18955df933..18955df933 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 944e8e5905..944e8e5905 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/java/sca-contrib/itest/jms-selectors/pom.xml b/sca-java-2.x/contrib/itest/jms-selectors/pom.xml
index 5c0a61bf3e..5c0a61bf3e 100644
--- a/java/sca-contrib/itest/jms-selectors/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-selectors/pom.xml
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/java/sca-contrib/itest/jms/pom.xml b/sca-java-2.x/contrib/itest/jms/pom.xml
index 49081dc48f..49081dc48f 100644
--- a/java/sca-contrib/itest/jms/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms/pom.xml
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 0643fc8376..0643fc8376 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 2c9e822ac1..2c9e822ac1 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index ab293a5df1..ab293a5df1 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 65a4b32694..65a4b32694 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 33298eb555..33298eb555 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 6ec88aac6c..6ec88aac6c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index fc155d0324..fc155d0324 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 8fd6cc94bf..8fd6cc94bf 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index 80368a0fb6..80368a0fb6 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
index 1baa4af6b4..1baa4af6b4 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
index dd4350c6fe..dd4350c6fe 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
index 6fb6330a21..6fb6330a21 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/properties/properties.composite
index 43bd611b24..43bd611b24 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/properties/properties.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..69c0ef305e 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/service.composite
index 2ab92923f6..2ab92923f6 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index ba3e697e13..ba3e697e13 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index fc47211f46..fc47211f46 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index c0c90cea95..c0c90cea95 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 4cc229422e..4cc229422e 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java