Moving 1.x branches

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

127 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.4/itest/jms-args/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/pom.xml
index 3561bbaf4d..3561bbaf4d 100644
--- a/branches/sca-java-1.4/itest/jms-args/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 51ce5f4f24..51ce5f4f24 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 487e5f2cbb..487e5f2cbb 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-args/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.4/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/branches/sca-java-1.4/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/pom.xml
index 3f2fe9aab8..3f2fe9aab8 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index 9d75685a8a..9d75685a8a 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index 9c2c657b55..9c2c657b55 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 5697d819c7..5697d819c7 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index b15b40c8a6..b15b40c8a6 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/pom.xml
index 1506f27683..1506f27683 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions.xml
index ff389c7014..ff389c7014 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/branches/sca-java-1.4/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-format/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/pom.xml
index 66217e1cf8..66217e1cf8 100644
--- a/branches/sca-java-1.4/itest/jms-format/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index b1f62c1422..b1f62c1422 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 878fdb4fe4..878fdb4fe4 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index 82c57dfe75..82c57dfe75 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index f0b7819c3b..f0b7819c3b 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 948732adb4..948732adb4 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index ed697f8a38..ed697f8a38 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index 574188d466..574188d466 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index 2956df755b..2956df755b 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index 39af400f6a..39af400f6a 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 81ea3edffb..81ea3edffb 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 89bae83c77..89bae83c77 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index a2cb1b6763..a2cb1b6763 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index 485e184f6c..485e184f6c 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index 4747136509..4747136509 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 35c383ace9..35c383ace9 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 7a4f4df2e7..7a4f4df2e7 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index bf19e9069b..bf19e9069b 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e1706dbe6b..e1706dbe6b 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 8f9c3564f8..8f9c3564f8 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
index ea6ed6c464..ea6ed6c464 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
index 6202e947f5..6202e947f5 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
index 1fc5c095f7..1fc5c095f7 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
index 0d0b5aef65..0d0b5aef65 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index a242206080..a242206080 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index c617a984ef..c617a984ef 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index 5306497a3f..5306497a3f 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 944e8e5905..944e8e5905 100644
--- a/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/pom.xml
index f41a57ecc0..f41a57ecc0 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 0ad6440593..0ad6440593 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index f26a3ce68b..f26a3ce68b 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.4/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/branches/sca-java-1.4/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms-topics/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/pom.xml
index f4a13fbd54..f4a13fbd54 100644
--- a/branches/sca-java-1.4/itest/jms-topics/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/jndi.properties
index 9888d5843b..9888d5843b 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsClient.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
index cf876932d9..cf876932d9 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsService.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsService.composite
index 2f2678ab0b..2f2678ab0b 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/main/resources/topics/TopicsService.composite
diff --git a/branches/sca-java-1.4/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index f0b7537bcc..f0b7537bcc 100644
--- a/branches/sca-java-1.4/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/pom.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms/pom.xml
index c575d6a164..c575d6a164 100644
--- a/branches/sca-java-1.4/itest/jms/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/pom.xml
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 4351b17cd6..4351b17cd6 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index cb244a5160..cb244a5160 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 40780709f4..40780709f4 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index b4d1cbccda..b4d1cbccda 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index e8242467cc..e8242467cc 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d376d74295..d376d74295 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index 142343e349..142343e349 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 218cccf64c..218cccf64c 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9795089952..9795089952 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index f16f853ba7..f16f853ba7 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index cfe7a649d9..cfe7a649d9 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/service.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/external/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/external/service.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/nonSCAclient/service.composite
index 1baa4af6b4..1baa4af6b4 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/definitions.xml b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/definitions.xml
index dd4350c6fe..dd4350c6fe 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/definitions.xml
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
index 6fb6330a21..6fb6330a21 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/properties/properties.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/properties/properties.composite
index 43bd611b24..43bd611b24 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/properties/properties.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..69c0ef305e 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/service.composite
index 2ab92923f6..2ab92923f6 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/branches/sca-java-1.4/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 22ebe9afcf..22ebe9afcf 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index fc47211f46..fc47211f46 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index c0c90cea95..c0c90cea95 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 4cc229422e..4cc229422e 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java