Moving 2.x trunk

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

921 files changed, 0 insertions, 0 deletions

diff --git a/java/sca/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
index 75134e7b11..75134e7b11 100644
--- a/java/sca/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index d7dff093f9..d7dff093f9 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 5ecf5494be..5ecf5494be 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 24ab0a4181..24ab0a4181 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index f46893481b..f46893481b 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index a687534bb2..a687534bb2 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index a9268ac1b5..a9268ac1b5 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index faa10b90ca..faa10b90ca 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index b976a53970..b976a53970 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index c0317687df..c0317687df 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 590f05ee84..590f05ee84 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 541a713112..541a713112 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/java/sca/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
index 4d2092e72f..4d2092e72f 100644
--- a/java/sca/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 315591fb98..315591fb98 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f42325910d..f42325910d 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/java/sca/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/java/sca/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld/pom.xml
index 8cc4639bfb..8cc4639bfb 100644
--- a/java/sca/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/pom.xml
diff --git a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 86e6e4e9c5..86e6e4e9c5 100644
--- a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 156e32e9ee..156e32e9ee 100644
--- a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index 832c8f3702..832c8f3702 100644
--- a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index c77318e8fd..c77318e8fd 100644
--- a/java/sca/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/java/sca/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/java/sca/itest/bpel/pom.xml b/sca-java-2.x/trunk/itest/bpel/pom.xml
index 35bcc66f90..35bcc66f90 100644
--- a/java/sca/itest/bpel/pom.xml
+++ b/sca-java-2.x/trunk/itest/bpel/pom.xml
diff --git a/java/sca/itest/builder/pom.xml b/sca-java-2.x/trunk/itest/builder/pom.xml
index 0caed4e534..0caed4e534 100644
--- a/java/sca/itest/builder/pom.xml
+++ b/sca-java-2.x/trunk/itest/builder/pom.xml
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index b0dc7a6389..b0dc7a6389 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index bf73a64027..bf73a64027 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index 6f36b1c55a..6f36b1c55a 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index 8c5c5de208..8c5c5de208 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index f4b8d2cf39..f4b8d2cf39 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 299f7606e3..299f7606e3 100644
--- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index d8cb23bbd3..d8cb23bbd3 100644
--- a/java/sca/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite
index 4e58cdfa16..4e58cdfa16 100644
--- a/java/sca/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 06b273c7a7..06b273c7a7 100644
--- a/java/sca/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index ac01b3c687..ac01b3c687 100644
--- a/java/sca/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite
index 2d127a7bec..2d127a7bec 100644
--- a/java/sca/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 98103e360e..98103e360e 100644
--- a/java/sca/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/java/sca/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index 8b82b43c68..8b82b43c68 100644
--- a/java/sca/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite
index 2f5ca96d07..2f5ca96d07 100644
--- a/java/sca/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 381ccddcc3..381ccddcc3 100644
--- a/java/sca/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/java/sca/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 4028098023..4028098023 100644
--- a/java/sca/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..23799f8487 100644
--- a/java/sca/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2b4f88dc3..a2b4f88dc3 100644
--- a/java/sca/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index 1da59d5f04..1da59d5f04 100644
--- a/java/sca/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite
index 631e38855f..631e38855f 100644
--- a/java/sca/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 98976dc4e8..98976dc4e8 100644
--- a/java/sca/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index b1d01afafb..b1d01afafb 100644
--- a/java/sca/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite
index 7672595959..7672595959 100644
--- a/java/sca/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite
index 2fe3592d12..2fe3592d12 100644
--- a/java/sca/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index 22950dfe03..22950dfe03 100644
--- a/java/sca/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite
index 84f42c60fc..84f42c60fc 100644
--- a/java/sca/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite
index 18ed91142c..18ed91142c 100644
--- a/java/sca/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index a17e27c9d8..a17e27c9d8 100644
--- a/java/sca/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite
index a0bdb0197d..a0bdb0197d 100644
--- a/java/sca/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 1b4cf27c76..1b4cf27c76 100644
--- a/java/sca/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 83a232db6e..83a232db6e 100644
--- a/java/sca/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite
index 2326afd2f2..2326afd2f2 100644
--- a/java/sca/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite
index fdf1423b66..fdf1423b66 100644
--- a/java/sca/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/java/sca/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 776dfe4d97..776dfe4d97 100644
--- a/java/sca/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite
index 9575612d51..9575612d51 100644
--- a/java/sca/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 9c7b58e2cb..9c7b58e2cb 100644
--- a/java/sca/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/java/sca/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index ede31d6bee..ede31d6bee 100644
--- a/java/sca/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite
index e1d2e0cefe..e1d2e0cefe 100644
--- a/java/sca/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite
index ef16dc0785..ef16dc0785 100644
--- a/java/sca/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/java/sca/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7bb9e694a3..7bb9e694a3 100644
--- a/java/sca/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite
index 467b7f57fa..467b7f57fa 100644
--- a/java/sca/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 9d9b5ba945..9d9b5ba945 100644
--- a/java/sca/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/java/sca/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/java/sca/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index b6ec160506..b6ec160506 100644
--- a/java/sca/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite
index 83584ed482..83584ed482 100644
--- a/java/sca/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/java/sca/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 0021ec242b..0021ec242b 100644
--- a/java/sca/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 6d41581371..6d41581371 100644
--- a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 27768f3799..27768f3799 100644
--- a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index c5eb7a70ea..c5eb7a70ea 100644
--- a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/java/sca/itest/callback-api/pom.xml b/sca-java-2.x/trunk/itest/callback-api/pom.xml
index 87ca4b67a0..87ca4b67a0 100644
--- a/java/sca/itest/callback-api/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-api/pom.xml
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index b013462f9f..b013462f9f 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 252e4dc45f..252e4dc45f 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index d883dc2d6f..d883dc2d6f 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index afb7c45e2c..afb7c45e2c 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 44f57b4316..44f57b4316 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 309311e258..309311e258 100644
--- a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 55736e5254..55736e5254 100644
--- a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 75fab95efb..75fab95efb 100644
--- a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/java/sca/itest/callback-basic-ws/pom.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
index a022adc0d1..a022adc0d1 100644
--- a/java/sca/itest/callback-basic-ws/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
diff --git a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/java/sca/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/java/sca/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index db1a2fbf6a..db1a2fbf6a 100644
--- a/java/sca/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
diff --git a/java/sca/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/java/sca/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/java/sca/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/java/sca/itest/callback-basic/pom.xml b/sca-java-2.x/trunk/itest/callback-basic/pom.xml
index 029bb56247..029bb56247 100644
--- a/java/sca/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-basic/pom.xml
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index 87cde940e1..87cde940e1 100644
--- a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index b58fabcd79..b58fabcd79 100644
--- a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/java/sca/itest/callback-complex-type/pom.xml b/sca-java-2.x/trunk/itest/callback-complex-type/pom.xml
index 726465f2b9..726465f2b9 100644
--- a/java/sca/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/pom.xml
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 627d37e27d..627d37e27d 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 966ad17b9a..966ad17b9a 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2dc0add75..d2dc0add75 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index 32ab1bdd3e..32ab1bdd3e 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index f7a1a195ed..f7a1a195ed 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 2eea567fff..2eea567fff 100644
--- a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index af0b373472..af0b373472 100644
--- a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
index dde489d766..dde489d766 100644
--- a/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
diff --git a/java/sca/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/trunk/itest/callback-multiple-wires/pom.xml
index b29900c6ef..b29900c6ef 100644
--- a/java/sca/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/pom.xml
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index c3ea6c3032..c3ea6c3032 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index 84ca158c97..84ca158c97 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index 66758a1e73..66758a1e73 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 49df5aa17a..49df5aa17a 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3d0b37eeae..3d0b37eeae 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index bd3cce74b4..bd3cce74b4 100644
--- a/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/java/sca/itest/callback-separatethread/pom.xml b/sca-java-2.x/trunk/itest/callback-separatethread/pom.xml
index 99ecf2e312..99ecf2e312 100644
--- a/java/sca/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/pom.xml
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index dc66003604..dc66003604 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index f03144db8a..f03144db8a 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index 137ea6a658..137ea6a658 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index 4bf05fc925..4bf05fc925 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index bec98a49c9..bec98a49c9 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index f803fb2ec9..f803fb2ec9 100644
--- a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index c216cab1be..c216cab1be 100644
--- a/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/java/sca/itest/component-type/pom.xml b/sca-java-2.x/trunk/itest/component-type/pom.xml
index 4dc05305af..4dc05305af 100644
--- a/java/sca/itest/component-type/pom.xml
+++ b/sca-java-2.x/trunk/itest/component-type/pom.xml
diff --git a/java/sca/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/java/sca/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/itest/component-type/src/main/resources/Calculator.composite
index ecee33e072..ecee33e072 100644
--- a/java/sca/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/Calculator.composite
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 78e169deb4..78e169deb4 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 5d66becedf..5d66becedf 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 22236ae0d0..22236ae0d0 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2035d617e5..2035d617e5 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index fe76f553be..fe76f553be 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/java/sca/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca/itest/contribution-folder/pom.xml b/sca-java-2.x/trunk/itest/contribution-folder/pom.xml
index 35e7bb03ae..35e7bb03ae 100644
--- a/java/sca/itest/contribution-folder/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-folder/pom.xml
diff --git a/java/sca/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/java/sca/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
index ef2a43c766..ef2a43c766 100644
--- a/java/sca/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index f67b212d99..f67b212d99 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 27a1ee74e4..27a1ee74e4 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/java/sca/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/java/sca/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
index 1ab420e93c..1ab420e93c 100644
--- a/java/sca/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/java/sca/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/java/sca/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 44614f243a..44614f243a 100644
--- a/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/java/sca/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
index cca05b9bb9..cca05b9bb9 100644
--- a/java/sca/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
diff --git a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index 7e11adcec7..7e11adcec7 100644
--- a/java/sca/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/java/sca/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/java/sca/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..d8133c4acc 100644
--- a/java/sca/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/pom.xml
diff --git a/java/sca/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/java/sca/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/java/sca/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/java/sca/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml
index 7c504aee50..7c504aee50 100644
--- a/java/sca/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index 8254b667f2..8254b667f2 100644
--- a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/java/sca/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/java/sca/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
index 40dab26baa..40dab26baa 100644
--- a/java/sca/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 130aa91093..130aa91093 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index 44ceba1240..44ceba1240 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 3cc6784eca..3cc6784eca 100644
--- a/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
index 91eb35d6c1..91eb35d6c1 100644
--- a/java/sca/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
diff --git a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index a53117e72f..a53117e72f 100644
--- a/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9bc94525e0..9bc94525e0 100644
--- a/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/pom.xml
index 0696df1951..0696df1951 100644
--- a/java/sca/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/pom.xml
diff --git a/java/sca/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/java/sca/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/java/sca/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/java/sca/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/java/sca/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
index 3d8b5e85c3..3d8b5e85c3 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index a47b9a71e9..a47b9a71e9 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 66227eacaa..66227eacaa 100644
--- a/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca/itest/contribution-import-export/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/pom.xml
index e64ff002e1..e64ff002e1 100644
--- a/java/sca/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-import-export/pom.xml
diff --git a/java/sca/itest/contribution-zip/pom.xml b/sca-java-2.x/trunk/itest/contribution-zip/pom.xml
index ecffbc155a..ecffbc155a 100644
--- a/java/sca/itest/contribution-zip/pom.xml
+++ b/sca-java-2.x/trunk/itest/contribution-zip/pom.xml
diff --git a/java/sca/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/java/sca/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
index 303e2a6d9a..303e2a6d9a 100644
--- a/java/sca/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
diff --git a/java/sca/itest/contribution-zip/src/test/resources/repository/contribution.zip b/sca-java-2.x/trunk/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 3239ae1242..3239ae1242 100644
--- a/java/sca/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ b/sca-java-2.x/trunk/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/java/sca/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
index 68e15d4a8b..68e15d4a8b 100644
--- a/java/sca/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
diff --git a/java/sca/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/pom.xml
index d58e479f93..d58e479f93 100644
--- a/java/sca/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/java/sca/itest/distribution/binding-ws-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
index ed22bce2dc..ed22bce2dc 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
index 3f4cb4b536..3f4cb4b536 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
diff --git a/java/sca/itest/distribution/calculator-rmi/build.xml b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
index 25abf4e040..25abf4e040 100644
--- a/java/sca/itest/distribution/calculator-rmi/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
diff --git a/java/sca/itest/distribution/calculator-rmi/pom.xml b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
index faf6132fbd..faf6132fbd 100644
--- a/java/sca/itest/distribution/calculator-rmi/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/calculator-rmi/pom.xml
diff --git a/java/sca/itest/distribution/implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
index 106fee758c..106fee758c 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
diff --git a/java/sca/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
index 584b7ca5e9..584b7ca5e9 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml
diff --git a/java/sca/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
index c5f118458f..c5f118458f 100644
--- a/java/sca/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml
diff --git a/java/sca/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 2cbbe57125..2cbbe57125 100644
--- a/java/sca/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/java/sca/itest/distribution/pom.xml b/sca-java-2.x/trunk/itest/distribution/pom.xml
index f8809b5ab2..f8809b5ab2 100644
--- a/java/sca/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-bpel/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
index e1c8a508f5..e1c8a508f5 100644
--- a/java/sca/itest/distribution/webapp-helloworld-bpel/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
index 5b29292acf..5b29292acf 100644
--- a/java/sca/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-jms/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
index 97662f26ca..97662f26ca 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jms/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
index bc436667c8..bc436667c8 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-js-client/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
index 32c66015d0..32c66015d0 100644
--- a/java/sca/itest/distribution/webapp-helloworld-js-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/java/sca/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-jsf/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
index 3a2ff11a11..3a2ff11a11 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jsf/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
index 1f90a772ac..1f90a772ac 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/src/test/java/itest/HelloworldTestCaseFIXME.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index 4f41a3a0ef..4f41a3a0ef 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 2be60be081..2be60be081 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-servlet/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
index 2b5915ca88..2b5915ca88 100644
--- a/java/sca/itest/distribution/webapp-helloworld-servlet/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index bed840b44a..bed840b44a 100644
--- a/java/sca/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld-stripes/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
index 8d312f75c8..8d312f75c8 100644
--- a/java/sca/itest/distribution/webapp-helloworld-stripes/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
diff --git a/java/sca/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 743ab054c8..743ab054c8 100644
--- a/java/sca/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/java/sca/itest/distribution/webapp-helloworld/pom.xml b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
index 81d7304e00..81d7304e00 100644
--- a/java/sca/itest/distribution/webapp-helloworld/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
diff --git a/java/sca/itest/domains/helloworld/pom.xml b/sca-java-2.x/trunk/itest/domains/helloworld/pom.xml
index 9100fa05c6..9100fa05c6 100644
--- a/java/sca/itest/domains/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/itest/domains/helloworld/pom.xml
diff --git a/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
index 2a10b3fb77..2a10b3fb77 100644
--- a/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
+++ b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
diff --git a/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
index b46cb2baca..b46cb2baca 100644
--- a/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/helloworld.composite
index 0834265186..0834265186 100644
--- a/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/helloworld.composite
diff --git a/java/sca/itest/domains/interfaces/pom.xml b/sca-java-2.x/trunk/itest/domains/interfaces/pom.xml
index 9e5a082f59..9e5a082f59 100644
--- a/java/sca/itest/domains/interfaces/pom.xml
+++ b/sca-java-2.x/trunk/itest/domains/interfaces/pom.xml
diff --git a/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java b/sca-java-2.x/trunk/itest/domains/interfaces/src/main/java/itest/Helloworld.java
index f764bc8358..f764bc8358 100644
--- a/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java
+++ b/sca-java-2.x/trunk/itest/domains/interfaces/src/main/java/itest/Helloworld.java
diff --git a/java/sca/itest/domains/pom.xml b/sca-java-2.x/trunk/itest/domains/pom.xml
index ab07312f62..ab07312f62 100644
--- a/java/sca/itest/domains/pom.xml
+++ b/sca-java-2.x/trunk/itest/domains/pom.xml
diff --git a/java/sca/itest/domains/standalone/pom.xml b/sca-java-2.x/trunk/itest/domains/standalone/pom.xml
index be441d2945..be441d2945 100644
--- a/java/sca/itest/domains/standalone/pom.xml
+++ b/sca-java-2.x/trunk/itest/domains/standalone/pom.xml
diff --git a/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/trunk/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
index 0fbcc98a96..0fbcc98a96 100644
--- a/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
+++ b/sca-java-2.x/trunk/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
diff --git a/java/sca/itest/endpoints/pom.xml b/sca-java-2.x/trunk/itest/endpoints/pom.xml
index 6a1930c627..6a1930c627 100644
--- a/java/sca/itest/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/itest/endpoints/pom.xml
diff --git a/java/sca/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
index c307547f56..c307547f56 100644
--- a/java/sca/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/itest/endpoints/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
index 064d615c45..064d615c45 100644
--- a/java/sca/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/EndpointsTestCase.java
index 7802848c3b..7802848c3b 100644
--- a/java/sca/itest/endpoints/src/test/java/test/EndpointsTestCase.java
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/EndpointsTestCase.java
diff --git a/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
index f3b6c15bf1..f3b6c15bf1 100644
--- a/java/sca/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
diff --git a/java/sca/itest/endpoints/src/test/java/test/Utils.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/Utils.java
index 5107d8f660..5107d8f660 100644
--- a/java/sca/itest/endpoints/src/test/java/test/Utils.java
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/Utils.java
diff --git a/java/sca/itest/endpoints/src/test/resources/helloworld.composite b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/helloworld.composite
index 081804b34e..081804b34e 100644
--- a/java/sca/itest/endpoints/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/helloworld.composite
diff --git a/java/sca/itest/endpoints/src/test/resources/nested.composite b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/nested.composite
index ffc73644f1..ffc73644f1 100644
--- a/java/sca/itest/endpoints/src/test/resources/nested.composite
+++ b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/nested.composite
diff --git a/java/sca/itest/exceptions/pom.xml b/sca-java-2.x/trunk/itest/exceptions/pom.xml
index 41dd198009..41dd198009 100644
--- a/java/sca/itest/exceptions/pom.xml
+++ b/sca-java-2.x/trunk/itest/exceptions/pom.xml
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index 1f57116bac..1f57116bac 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 112aefc747..112aefc747 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index 53a6c70b57..53a6c70b57 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index ace219991b..ace219991b 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 26b9f0a383..26b9f0a383 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index cd62338841..cd62338841 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 56b9fc6f5b..56b9fc6f5b 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index c5b54ff902..c5b54ff902 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
index d42866303e..d42866303e 100644
--- a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 7794348476..7794348476 100644
--- a/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/java/sca/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
index 1ce02ed1ee..1ce02ed1ee 100644
--- a/java/sca/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
diff --git a/java/sca/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index bd7770ca7d..bd7770ca7d 100644
--- a/java/sca/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 747433a9e7..747433a9e7 100644
--- a/java/sca/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index eae607a7ca..eae607a7ca 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index b033516c1b..b033516c1b 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/java/sca/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index fed509df98..fed509df98 100644
--- a/java/sca/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 8bb3006d12..8bb3006d12 100644
--- a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index f68134702b..f68134702b 100644
--- a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 78b3649b5b..78b3649b5b 100644
--- a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBean.java
index 1a0abd7f8f..1a0abd7f8f 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index e3d9a36bb8..e3d9a36bb8 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 47342fded8..47342fded8 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReference.java
index 6f5b280f31..6f5b280f31 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index dea7933e1a..dea7933e1a 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index b80b05dc08..b80b05dc08 100644
--- a/java/sca/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/java/sca/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index ecb085858d..ecb085858d 100644
--- a/java/sca/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
index 81d59432b8..81d59432b8 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index abdaa98bff..abdaa98bff 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index dd186bddfc..dd186bddfc 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index a0bb10e8dd..a0bb10e8dd 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 1c4b81db33..1c4b81db33 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
index 9267f28e83..9267f28e83 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
index 5b1885d6b3..5b1885d6b3 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
index dcc88f6770..dcc88f6770 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 1000e616a7..1000e616a7 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
index 278c94a18e..278c94a18e 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index 2731fc455f..2731fc455f 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index 8613e6c82a..8613e6c82a 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index e8357cc62e..e8357cc62e 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 9912624870..9912624870 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index b8389be7f6..b8389be7f6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 8d1a655c4e..8d1a655c4e 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index 1705164104..1705164104 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index 539dfa6e32..539dfa6e32 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 294b211431..294b211431 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index c77ab00323..c77ab00323 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 42e0cdbd23..42e0cdbd23 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 83558e8abc..83558e8abc 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index b7c45b289f..b7c45b289f 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index e1ccbcf3c6..e1ccbcf3c6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index 236e2b23e6..236e2b23e6 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
index 4a873f2424..4a873f2424 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index 4503294f10..4503294f10 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 2602839d1d..2602839d1d 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index 254b8100e1..254b8100e1 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 8df60c5bab..8df60c5bab 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index f5261c85bb..f5261c85bb 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index 9ff1b74567..9ff1b74567 100644
--- a/java/sca/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 8b12dd7af7..8b12dd7af7 100644
--- a/java/sca/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index a44ae38d24..a44ae38d24 100644
--- a/java/sca/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index d54f0544d8..d54f0544d8 100644
--- a/java/sca/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index 71768f5a7b..71768f5a7b 100644
--- a/java/sca/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 0c6f8d2e84..0c6f8d2e84 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 73b151bf7a..73b151bf7a 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 5869d344f6..5869d344f6 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index 90d26dd89f..90d26dd89f 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index f28dace31a..f28dace31a 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index def30b3ea0..def30b3ea0 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/java/sca/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 0c2e1daa81..0c2e1daa81 100644
--- a/java/sca/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 8d0c548899..8d0c548899 100644
--- a/java/sca/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index f4bd53876c..f4bd53876c 100644
--- a/java/sca/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 0907985d7f..0907985d7f 100644
--- a/java/sca/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index 13b84c8c73..13b84c8c73 100644
--- a/java/sca/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/java/sca/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 5db9c84c00..5db9c84c00 100644
--- a/java/sca/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/java/sca/itest/interfaces/pom.xml b/sca-java-2.x/trunk/itest/interfaces/pom.xml
index 09a969d146..09a969d146 100644
--- a/java/sca/itest/interfaces/pom.xml
+++ b/sca-java-2.x/trunk/itest/interfaces/pom.xml
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index f4131593d5..f4131593d5 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 5fc9ed51b3..5fc9ed51b3 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index 6cd937af12..6cd937af12 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 05a9d09bdd..05a9d09bdd 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index ab0b18191c..ab0b18191c 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 724d94dffb..724d94dffb 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index be3fa4c15a..be3fa4c15a 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index 9f34dfd274..9f34dfd274 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index 541b1f1508..541b1f1508 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index b29b298ab6..b29b298ab6 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 00a0f5645b..00a0f5645b 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
index 27ada047b9..27ada047b9 100644
--- a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/java/sca/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
index c91d49a49a..c91d49a49a 100644
--- a/java/sca/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
+++ b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
diff --git a/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 31e40d59c5..31e40d59c5 100644
--- a/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
index b1d4dba07d..b1d4dba07d 100644
--- a/java/sca/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
+++ b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
diff --git a/java/sca/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/trunk/itest/jaxws-asyncclient/pom.xml
index 97963fdd6c..97963fdd6c 100644
--- a/java/sca/itest/jaxws-asyncclient/pom.xml
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/pom.xml
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
index 4e55bae98d..4e55bae98d 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
index 0bf3328c31..0bf3328c31 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
index a43b85361b..a43b85361b 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
index b15ab6be08..b15ab6be08 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
index 11ace7a788..11ace7a788 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
index 313edf0435..313edf0435 100644
--- a/java/sca/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
diff --git a/java/sca/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
index eb72924093..eb72924093 100644
--- a/java/sca/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
+++ b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
diff --git a/java/sca/itest/jaxws/pom.xml b/sca-java-2.x/trunk/itest/jaxws/pom.xml
index 1f0274b7ed..1f0274b7ed 100644
--- a/java/sca/itest/jaxws/pom.xml
+++ b/sca-java-2.x/trunk/itest/jaxws/pom.xml
diff --git a/java/sca/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
index e1c2bedea3..e1c2bedea3 100644
--- a/java/sca/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
+++ b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
diff --git a/java/sca/itest/jaxws/src/test/java/stock/StockQuote.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuote.java
index 74e25bb3bd..74e25bb3bd 100644
--- a/java/sca/itest/jaxws/src/test/java/stock/StockQuote.java
+++ b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuote.java
diff --git a/java/sca/itest/jaxws/src/test/java/stock/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
index 516c63d864..516c63d864 100644
--- a/java/sca/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
diff --git a/java/sca/itest/jaxws/src/test/resources/StockQuote.composite b/sca-java-2.x/trunk/itest/jaxws/src/test/resources/StockQuote.composite
index b2c9bd8ddb..b2c9bd8ddb 100644
--- a/java/sca/itest/jaxws/src/test/resources/StockQuote.composite
+++ b/sca-java-2.x/trunk/itest/jaxws/src/test/resources/StockQuote.composite
diff --git a/java/sca/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/pom.xml
index 4a28617959..4a28617959 100644
--- a/java/sca/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/pom.xml
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
index a9d43b5637..a9d43b5637 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
index cbad991ac5..cbad991ac5 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
diff --git a/java/sca/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index 3bf4e0bc30..3bf4e0bc30 100644
--- a/java/sca/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/java/sca/itest/jms/args/pom.xml b/sca-java-2.x/trunk/itest/jms/args/pom.xml
index 405017ef33..405017ef33 100644
--- a/java/sca/itest/jms/args/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/args/pom.xml
diff --git a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
index 07caa57490..07caa57490 100644
--- a/java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca/itest/jms/args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
index 1a9075f6d4..1a9075f6d4 100644
--- a/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
diff --git a/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/trunk/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 28e0b530c1..28e0b530c1 100644
--- a/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/java/sca/itest/jms/callbacks/pom.xml b/sca-java-2.x/trunk/itest/jms/callbacks/pom.xml
index 780724ce5e..780724ce5e 100644
--- a/java/sca/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/pom.xml
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index a4d5190af3..a4d5190af3 100644
--- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index e8357338ae..e8357338ae 100644
--- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
index 95c3a41c43..95c3a41c43 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties
index dec266b133..dec266b133 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
index 19124fc3e6..19124fc3e6 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index 5ef7c981f0..5ef7c981f0 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
diff --git a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index 18911ad8b6..18911ad8b6 100644
--- a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index b335add358..b335add358 100644
--- a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/java/sca/itest/jms/defaults/pom.xml b/sca-java-2.x/trunk/itest/jms/defaults/pom.xml
index df8dc88819..df8dc88819 100644
--- a/java/sca/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/defaults/pom.xml
diff --git a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
index 2a74e465ea..2a74e465ea 100644
--- a/java/sca/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
index c4d5215f86..c4d5215f86 100644
--- a/java/sca/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
diff --git a/java/sca/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/service.composite
index a4de896f24..a4de896f24 100644
--- a/java/sca/itest/jms/defaults/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/service.composite
diff --git a/java/sca/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/defaults/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/trunk/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index d2b1a5fe59..d2b1a5fe59 100644
--- a/java/sca/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/java/sca/itest/jms/definitions/pom.xml b/sca-java-2.x/trunk/itest/jms/definitions/pom.xml
index 28e9dd74c5..28e9dd74c5 100644
--- a/java/sca/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/definitions/pom.xml
diff --git a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
index 07caa57490..07caa57490 100644
--- a/java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/java/sca/itest/jms/definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions.xml
diff --git a/java/sca/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions/definitions.composite
index 67a62a7165..67a62a7165 100644
--- a/java/sca/itest/jms/definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions/definitions.composite
diff --git a/java/sca/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/java/sca/itest/jms/definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/trunk/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 729ad072b7..729ad072b7 100644
--- a/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/java/sca/itest/jms/exceptions/pom.xml b/sca-java-2.x/trunk/itest/jms/exceptions/pom.xml
index 4189bb096e..4189bb096e 100644
--- a/java/sca/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/pom.xml
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/java/sca/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
index c9945cc57d..c9945cc57d 100644
--- a/java/sca/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 9eb8f2b27d..9eb8f2b27d 100644
--- a/java/sca/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
diff --git a/java/sca/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/java/sca/itest/jms/exceptions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index a1a6c4aae0..a1a6c4aae0 100644
--- a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/java/sca/itest/jms/exceptions1/pom.xml b/sca-java-2.x/trunk/itest/jms/exceptions1/pom.xml
index 5c6dbaaaa2..5c6dbaaaa2 100644
--- a/java/sca/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/pom.xml
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 02426936d2..02426936d2 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/java/sca/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/java/sca/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
index c28c94da98..c28c94da98 100644
--- a/java/sca/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 5d1c57a1f3..5d1c57a1f3 100644
--- a/java/sca/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
diff --git a/java/sca/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
index 6875772d56..6875772d56 100644
--- a/java/sca/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
diff --git a/java/sca/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/exceptions1/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 0d897d8703..0d897d8703 100644
--- a/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/java/sca/itest/jms/externalBroker/pom.xml b/sca-java-2.x/trunk/itest/jms/externalBroker/pom.xml
index ac890aa687..ac890aa687 100644
--- a/java/sca/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/pom.xml
diff --git a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
index 60b132ca1b..60b132ca1b 100644
--- a/java/sca/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/client.composite
index cad76ef45f..cad76ef45f 100644
--- a/java/sca/itest/jms/externalBroker/src/main/resources/external/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/client.composite
diff --git a/java/sca/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/service.composite
index 8a76d8cd29..8a76d8cd29 100644
--- a/java/sca/itest/jms/externalBroker/src/main/resources/external/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/service.composite
diff --git a/java/sca/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/externalBroker/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index b8cbde7b26..b8cbde7b26 100644
--- a/java/sca/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/java/sca/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/pom.xml
index fac0721715..fac0721715 100644
--- a/java/sca/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/pom.xml
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index e5a904871c..e5a904871c 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 49cb0a69ab..49cb0a69ab 100644
--- a/java/sca/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/pom.xml
index 7705c82c55..7705c82c55 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/pom.xml
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index a28e6e5f6d..a28e6e5f6d 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index 53498ce44d..53498ce44d 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/pom.xml
index 85cd35ec82..85cd35ec82 100644
--- a/java/sca/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/pom.xml
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index a6d6e04ac8..a6d6e04ac8 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index 78c0239f0d..78c0239f0d 100644
--- a/java/sca/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/java/sca/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/pom.xml
index 312dea14fa..312dea14fa 100644
--- a/java/sca/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/pom.xml
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index c624a11233..c624a11233 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
index f72ce434fa..f72ce434fa 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index f47031da10..f47031da10 100644
--- a/java/sca/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/java/sca/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsobject/pom.xml
index 9e784d5f4f..9e784d5f4f 100644
--- a/java/sca/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/pom.xml
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index e037aa74d9..e037aa74d9 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
index 4625f46578..4625f46578 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/java/sca/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmsobject/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index a2bfc0ca8a..a2bfc0ca8a 100644
--- a/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/java/sca/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstext/pom.xml
index a416b7ae72..a416b7ae72 100644
--- a/java/sca/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/pom.xml
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index d700a92f20..d700a92f20 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmstext/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index b887aa18fd..b887aa18fd 100644
--- a/java/sca/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
diff --git a/java/sca/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/pom.xml
index 9235ad3f93..9235ad3f93 100644
--- a/java/sca/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/pom.xml
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index 72e7646704..72e7646704 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
index 53db66ea7e..53db66ea7e 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 6054050a5d..6054050a5d 100644
--- a/java/sca/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index 28da31fbde..28da31fbde 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 7bb33ae270..7bb33ae270 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 9f955c278a..9f955c278a 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
index 7c1cce6087..7c1cce6087 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
index 3d41f656f9..3d41f656f9 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
index 84ac2356db..84ac2356db 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index b8bc67d5e3..b8bc67d5e3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 8fc3d77cb3..8fc3d77cb3 100644
--- a/java/sca/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/java/sca/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/trunk/itest/jms/non-sca-client/pom.xml
index 84331d04cc..84331d04cc 100644
--- a/java/sca/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/pom.xml
diff --git a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
index 90106d2cbf..90106d2cbf 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 967754b6e4..967754b6e4 100644
--- a/java/sca/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
diff --git a/java/sca/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 54cfdeb273..54cfdeb273 100644
--- a/java/sca/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/java/sca/itest/jms/noreplyto/pom.xml b/sca-java-2.x/trunk/itest/jms/noreplyto/pom.xml
index 79cbc59ed5..79cbc59ed5 100644
--- a/java/sca/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/pom.xml
diff --git a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
index 58ceeded7e..58ceeded7e 100644
--- a/java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
index 86bb60c147..86bb60c147 100644
--- a/java/sca/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
diff --git a/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
index 848e340181..848e340181 100644
--- a/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/java/sca/itest/jms/nulls/pom.xml b/sca-java-2.x/trunk/itest/jms/nulls/pom.xml
index cdf628fe76..cdf628fe76 100644
--- a/java/sca/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/nulls/pom.xml
diff --git a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 7fed36fa77..7fed36fa77 100644
--- a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 7ab6019fd5..7ab6019fd5 100644
--- a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 89758becff..89758becff 100644
--- a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
index eee9c86565..eee9c86565 100644
--- a/java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca/itest/jms/nulls/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
index e190cf92c9..e190cf92c9 100644
--- a/java/sca/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
diff --git a/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/trunk/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
index ac872f46a6..ac872f46a6 100644
--- a/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/java/sca/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/trunk/itest/jms/oneway-nocf/pom.xml
index 97365205e6..97365205e6 100644
--- a/java/sca/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/pom.xml
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
index 360b365d1b..360b365d1b 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index 70a106bf06..70a106bf06 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index 5412a1d6e0..5412a1d6e0 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 5d1f764382..5d1f764382 100644
--- a/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/java/sca/itest/jms/oneway/pom.xml b/sca-java-2.x/trunk/itest/jms/oneway/pom.xml
index f201e5e0d3..f201e5e0d3 100644
--- a/java/sca/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/oneway/pom.xml
diff --git a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/java/sca/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
index 360b365d1b..360b365d1b 100644
--- a/java/sca/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/oneway/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
index eeeb3b90d0..eeeb3b90d0 100644
--- a/java/sca/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
diff --git a/java/sca/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
index e41e226994..e41e226994 100644
--- a/java/sca/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
diff --git a/java/sca/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/trunk/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 14bbf238e1..14bbf238e1 100644
--- a/java/sca/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/java/sca/itest/jms/policy-headers/pom.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/pom.xml
index 42596b8d0e..42596b8d0e 100644
--- a/java/sca/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/pom.xml
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/java/sca/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/java/sca/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
index a930b9e9a7..a930b9e9a7 100644
--- a/java/sca/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/policy-headers/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
index 8c608adec9..8c608adec9 100644
--- a/java/sca/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/definitions.xml
diff --git a/java/sca/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index f2761f0b78..f2761f0b78 100644
--- a/java/sca/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/java/sca/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index ebffbc4bc4..ebffbc4bc4 100644
--- a/java/sca/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/java/sca/itest/jms/pom.xml b/sca-java-2.x/trunk/itest/jms/pom.xml
index ad92cd5eec..ad92cd5eec 100644
--- a/java/sca/itest/jms/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/pom.xml
diff --git a/java/sca/itest/jms/properties/pom.xml b/sca-java-2.x/trunk/itest/jms/properties/pom.xml
index 72d1041f44..72d1041f44 100644
--- a/java/sca/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/properties/pom.xml
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/java/sca/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/java/sca/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
index a930b9e9a7..a930b9e9a7 100644
--- a/java/sca/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/properties/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
index 73f2a8eadc..73f2a8eadc 100644
--- a/java/sca/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
diff --git a/java/sca/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/trunk/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index e8d748bb19..e8d748bb19 100644
--- a/java/sca/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/java/sca/itest/jms/responsecf/pom.xml b/sca-java-2.x/trunk/itest/jms/responsecf/pom.xml
index fb7edf2918..fb7edf2918 100644
--- a/java/sca/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/pom.xml
diff --git a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
index c062ef9ec0..c062ef9ec0 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/client.composite
index 3a03f9b675..3a03f9b675 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/client.composite
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/service.composite
index d7ba8f2838..d7ba8f2838 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/service.composite
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
index 03b834ce7d..03b834ce7d 100644
--- a/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/java/sca/itest/jms/rpc/pom.xml b/sca-java-2.x/trunk/itest/jms/rpc/pom.xml
index b436479c3c..b436479c3c 100644
--- a/java/sca/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/rpc/pom.xml
diff --git a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
index c062ef9ec0..c062ef9ec0 100644
--- a/java/sca/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/client.composite
index bed860e2cd..bed860e2cd 100644
--- a/java/sca/itest/jms/rpc/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/client.composite
diff --git a/java/sca/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/java/sca/itest/jms/rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/service.composite
diff --git a/java/sca/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/trunk/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index 3c0eb0791b..3c0eb0791b 100644
--- a/java/sca/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/java/sca/itest/jms/selectors/pom.xml b/sca-java-2.x/trunk/itest/jms/selectors/pom.xml
index c3dd5edee8..c3dd5edee8 100644
--- a/java/sca/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/selectors/pom.xml
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
index 0592194b21..0592194b21 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
index 2d4ff0192b..2d4ff0192b 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
index b632b3f60f..b632b3f60f 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
index b2df9137c8..b2df9137c8 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
index 0b24678543..0b24678543 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
index 0ce66005fc..0ce66005fc 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
index 7e42113da4..7e42113da4 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
index 724de6ff7c..724de6ff7c 100644
--- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
index 59cf4aee9d..59cf4aee9d 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index ab8e29ccdd..ab8e29ccdd 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index af36b8af9b..af36b8af9b 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index bf10f20d38..bf10f20d38 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
index bee0c549bd..bee0c549bd 100644
--- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index 33e047ae18..33e047ae18 100644
--- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index e7254005be..e7254005be 100644
--- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/java/sca/itest/jms/topics/pom.xml b/sca-java-2.x/trunk/itest/jms/topics/pom.xml
index 71a6e0f473..71a6e0f473 100644
--- a/java/sca/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/topics/pom.xml
diff --git a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
index 2690297524..2690297524 100644
--- a/java/sca/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/jndi.properties
index 9888d5843b..9888d5843b 100644
--- a/java/sca/itest/jms/topics/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index b951484044..b951484044 100644
--- a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
diff --git a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index 80c653cc29..80c653cc29 100644
--- a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsService.composite
diff --git a/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/trunk/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index 35fe96b81a..35fe96b81a 100644
--- a/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/java/sca/itest/jms/ttl/pom.xml b/sca-java-2.x/trunk/itest/jms/ttl/pom.xml
index c7462bc039..c7462bc039 100644
--- a/java/sca/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/ttl/pom.xml
diff --git a/java/sca/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/java/sca/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/java/sca/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
index dc6577b7e1..dc6577b7e1 100644
--- a/java/sca/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/java/sca/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 4f9908f062..4f9908f062 100644
--- a/java/sca/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
index eeae8fcc59..eeae8fcc59 100644
--- a/java/sca/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/jndi.properties
index 040ec282d7..040ec282d7 100644
--- a/java/sca/itest/jms/ttl/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/ttl.composite
index 91b64cf8dc..91b64cf8dc 100644
--- a/java/sca/itest/jms/ttl/src/main/resources/ttl.composite
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/ttl.composite
diff --git a/java/sca/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/trunk/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
index b5839f4c4f..b5839f4c4f 100644
--- a/java/sca/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/java/sca/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/trunk/itest/jms/uri-rpc/pom.xml
index 61c0602f03..61c0602f03 100644
--- a/java/sca/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/pom.xml
diff --git a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
index 3349754e4a..3349754e4a 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties
diff --git a/java/sca/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite
index 01553a968c..01553a968c 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite
diff --git a/java/sca/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 9e7b119fad..9e7b119fad 100644
--- a/java/sca/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
diff --git a/java/sca/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index 60b0f0a1a3..60b0f0a1a3 100644
--- a/java/sca/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/java/sca/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-client/pom.xml
index 8367550f5a..8367550f5a 100644
--- a/java/sca/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-client/pom.xml
diff --git a/java/sca/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index bf8a588928..bf8a588928 100644
--- a/java/sca/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/java/sca/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
index b4ba94220c..b4ba94220c 100644
--- a/java/sca/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 9d5e9ae59a..9d5e9ae59a 100644
--- a/java/sca/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/java/sca/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/pom.xml
index 87b6a4fc51..87b6a4fc51 100644
--- a/java/sca/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/pom.xml
diff --git a/java/sca/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index 76f8d4400d..76f8d4400d 100644
--- a/java/sca/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/java/sca/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service/pom.xml
index bae0db69bd..bae0db69bd 100644
--- a/java/sca/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-service/pom.xml
diff --git a/java/sca/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index 81f7e1747d..81f7e1747d 100644
--- a/java/sca/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/java/sca/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
index c65718909d..c65718909d 100644
--- a/java/sca/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 6b2d15b7a6..6b2d15b7a6 100644
--- a/java/sca/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/java/sca/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-node-test/pom.xml
index d35761bc88..d35761bc88 100644
--- a/java/sca/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/one-node-test/pom.xml
diff --git a/java/sca/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 6d49b718ef..6d49b718ef 100644
--- a/java/sca/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/java/sca/itest/nodes/pom.xml b/sca-java-2.x/trunk/itest/nodes/pom.xml
index 5a3e4fe7e3..5a3e4fe7e3 100644
--- a/java/sca/itest/nodes/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/pom.xml
diff --git a/java/sca/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
index a01b682803..a01b682803 100644
--- a/java/sca/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index 5f9453a5d6..5f9453a5d6 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index b413825106..b413825106 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
index 4a41ae8133..4a41ae8133 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
index 7dfa6e66cc..7dfa6e66cc 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 769aad1940..769aad1940 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/build.xml
index 933aec2636..933aec2636 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/build.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/build.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 1bda0ee4b7..1bda0ee4b7 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client-config.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client.xml
index bb65805144..bb65805144 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/client.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
index 1ffccd9fd5..1ffccd9fd5 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 14a48f507a..14a48f507a 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml
index 7b6d206b7f..7b6d206b7f 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/server.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
index b27d16a562..b27d16a562 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/java/sca/itest/operation-overloading/pom.xml b/sca-java-2.x/trunk/itest/operation-overloading/pom.xml
index 48410a4b47..48410a4b47 100644
--- a/java/sca/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/trunk/itest/operation-overloading/pom.xml
diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 1f589b44f4..1f589b44f4 100644
--- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index a30d3611fb..a30d3611fb 100644
--- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index 9ec60eb78f..9ec60eb78f 100644
--- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 62e5c14ce2..62e5c14ce2 100644
--- a/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/java/sca/itest/policies/pom.xml b/sca-java-2.x/trunk/itest/policies/pom.xml
index daa3e395f5..daa3e395f5 100644
--- a/java/sca/itest/policies/pom.xml
+++ b/sca-java-2.x/trunk/itest/policies/pom.xml
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
index fd33be01d6..fd33be01d6 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
index 368179dc29..368179dc29 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
index 05ea341466..05ea341466 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
index c9f50d08ee..c9f50d08ee 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
index cc7c555aff..cc7c555aff 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
index 01cc8ac636..01cc8ac636 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
index 943720451f..943720451f 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
diff --git a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
index b712b99388..b712b99388 100644
--- a/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
+++ b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
diff --git a/java/sca/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/trunk/itest/policies/src/main/resources/Customer.composite
index 2a8f598b90..2a8f598b90 100644
--- a/java/sca/itest/policies/src/main/resources/Customer.composite
+++ b/sca-java-2.x/trunk/itest/policies/src/main/resources/Customer.composite
diff --git a/java/sca/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/trunk/itest/policies/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/java/sca/itest/policies/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/trunk/itest/policies/src/main/resources/LoggingMessages.properties
diff --git a/java/sca/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/definitions.xml
index 0a39912bf0..0a39912bf0 100644
--- a/java/sca/itest/policies/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/definitions.xml
diff --git a/java/sca/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/sca-contribution.xml
index be63597c12..be63597c12 100644
--- a/java/sca/itest/policies/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/trunk/itest/policies/src/main/resources/Payment.composite
index df54d0c1c2..df54d0c1c2 100644
--- a/java/sca/itest/policies/src/main/resources/Payment.composite
+++ b/sca-java-2.x/trunk/itest/policies/src/main/resources/Payment.composite
diff --git a/java/sca/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/trunk/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
index 3385ee9071..3385ee9071 100644
--- a/java/sca/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
diff --git a/java/sca/itest/pom.xml b/sca-java-2.x/trunk/itest/pom.xml
index 6a6d2ad613..6a6d2ad613 100644
--- a/java/sca/itest/pom.xml
+++ b/sca-java-2.x/trunk/itest/pom.xml
diff --git a/java/sca/itest/properties/pom.xml b/sca-java-2.x/trunk/itest/properties/pom.xml
index ec04cdba99..ec04cdba99 100644
--- a/java/sca/itest/properties/pom.xml
+++ b/sca-java-2.x/trunk/itest/properties/pom.xml
diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 1642ab55f5..1642ab55f5 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 9c7e8c3447..9c7e8c3447 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 64ca749e9f..64ca749e9f 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 7c700903d6..7c700903d6 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 1d2e563095..1d2e563095 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 54082e297a..54082e297a 100644
--- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 7e3b2b35f0..7e3b2b35f0 100644
--- a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/java/sca/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/Outer.composite
index 5e767b1e0e..5e767b1e0e 100644
--- a/java/sca/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/Outer.composite
diff --git a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
index fd181bfcaa..fd181bfcaa 100644
--- a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/java/sca/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
index 36f75d52a1..36f75d52a1 100644
--- a/java/sca/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/java/sca/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/trunk/itest/properties/src/main/resources/customer.xsd
index 7421750f1b..7421750f1b 100644
--- a/java/sca/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/customer.xsd
diff --git a/java/sca/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/java/sca/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt
diff --git a/java/sca/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 6d4180ee2f..6d4180ee2f 100644
--- a/java/sca/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/java/sca/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/mySimpleService.composite
index 3cf25384e6..3cf25384e6 100644
--- a/java/sca/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/java/sca/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/java/sca/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcProps.txt
diff --git a/java/sca/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/java/sca/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcprops.xsd
diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 0906a45ab3..0906a45ab3 100644
--- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index eb217600db..eb217600db 100644
--- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..a0213ced46 100644
--- a/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/java/sca/itest/recursive-multi-level/pom.xml b/sca-java-2.x/trunk/itest/recursive-multi-level/pom.xml
index 6114e64ad8..6114e64ad8 100644
--- a/java/sca/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/pom.xml
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 261eff2584..261eff2584 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index f3c9280f96..f3c9280f96 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 090bc49a41..090bc49a41 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index 8c1a9a2f72..8c1a9a2f72 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 884a8b0a96..884a8b0a96 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index b9b4e3ba7c..b9b4e3ba7c 100644
--- a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/java/sca/itest/references/pom.xml b/sca-java-2.x/trunk/itest/references/pom.xml
index 9da71f2ee8..9da71f2ee8 100644
--- a/java/sca/itest/references/pom.xml
+++ b/sca-java-2.x/trunk/itest/references/pom.xml
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index cd0aad3eea..cd0aad3eea 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 211e6160f6..211e6160f6 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 47a1f9bde8..47a1f9bde8 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 80617bdec2..80617bdec2 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index d181ac96ca..d181ac96ca 100644
--- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 3934025e64..3934025e64 100644
--- a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite
index 871a846edf..871a846edf 100644
--- a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 52d6fe48c1..52d6fe48c1 100644
--- a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 76264d308f..76264d308f 100644
--- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 6e4212fd9a..6e4212fd9a 100644
--- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 2fce95401e..2fce95401e 100644
--- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/java/sca/itest/scaclient-api/pom.xml b/sca-java-2.x/trunk/itest/scaclient-api/pom.xml
index 795221292c..795221292c 100644
--- a/java/sca/itest/scaclient-api/pom.xml
+++ b/sca-java-2.x/trunk/itest/scaclient-api/pom.xml
diff --git a/java/sca/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/java/sca/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldService.java
diff --git a/java/sca/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 4b9910bb21..4b9910bb21 100644
--- a/java/sca/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/java/sca/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/Helloworld.composite
index 3f0e0a164c..3f0e0a164c 100644
--- a/java/sca/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/Helloworld.composite
diff --git a/java/sca/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
index d8604a5cc0..d8604a5cc0 100644
--- a/java/sca/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index a331e4dd22..a331e4dd22 100644
--- a/java/sca/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/java/sca/itest/scdl/pom.xml b/sca-java-2.x/trunk/itest/scdl/pom.xml
index 54e1c132ec..54e1c132ec 100644
--- a/java/sca/itest/scdl/pom.xml
+++ b/sca-java-2.x/trunk/itest/scdl/pom.xml
diff --git a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index c56545dd3b..c56545dd3b 100644
--- a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
diff --git a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
index 18fb9394bf..18fb9394bf 100644
--- a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
diff --git a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index 44695e5dde..44695e5dde 100644
--- a/java/sca/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
diff --git a/java/sca/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/trunk/itest/scdl/src/test/resources/test.composite
index aa11c0d092..aa11c0d092 100644
--- a/java/sca/itest/scdl/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/resources/test.composite
diff --git a/java/sca/itest/scopes/pom.xml b/sca-java-2.x/trunk/itest/scopes/pom.xml
index 4ba97f3062..4ba97f3062 100644
--- a/java/sca/itest/scopes/pom.xml
+++ b/sca-java-2.x/trunk/itest/scopes/pom.xml
diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 208ac3ba44..208ac3ba44 100644
--- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index e6bf08ccf2..e6bf08ccf2 100644
--- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/java/sca/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/trunk/itest/scopes/src/main/resources/scopes.composite
index 83a71218f5..83a71218f5 100644
--- a/java/sca/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/trunk/itest/scopes/src/main/resources/scopes.composite
diff --git a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 594bdd5038..594bdd5038 100644
--- a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/java/sca/itest/service-reference/pom.xml b/sca-java-2.x/trunk/itest/service-reference/pom.xml
index 0fdd1cb994..0fdd1cb994 100644
--- a/java/sca/itest/service-reference/pom.xml
+++ b/sca-java-2.x/trunk/itest/service-reference/pom.xml
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
index 8b5cf4d29a..8b5cf4d29a 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
index 3f68ac828a..3f68ac828a 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
index 18242cd594..18242cd594 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
index dd143df036..dd143df036 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
index fb436ae10c..fb436ae10c 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
index fc15b632d2..fc15b632d2 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
index 276093b69f..276093b69f 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
index 84e15b5eb2..84e15b5eb2 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
diff --git a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
index db99472385..db99472385 100644
--- a/java/sca/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
diff --git a/java/sca/itest/service-reference/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
index fb88cd8bea..fb88cd8bea 100644
--- a/java/sca/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
diff --git a/java/sca/itest/service-reference/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
index 06e4c63e94..06e4c63e94 100644
--- a/java/sca/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
diff --git a/java/sca/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
index 63302847b5..63302847b5 100644
--- a/java/sca/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
+++ b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
diff --git a/java/sca/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
index 843afe207c..843afe207c 100644
--- a/java/sca/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
diff --git a/java/sca/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
index 1a454c939a..1a454c939a 100644
--- a/java/sca/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
diff --git a/java/sca/itest/services/pom.xml b/sca-java-2.x/trunk/itest/services/pom.xml
index 7564ee1c9a..7564ee1c9a 100644
--- a/java/sca/itest/services/pom.xml
+++ b/sca-java-2.x/trunk/itest/services/pom.xml
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 26e58dc530..26e58dc530 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 627ff4976f..627ff4976f 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index d04bd1b985..d04bd1b985 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index 01df89a8fa..01df89a8fa 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 07397e4502..07397e4502 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index 842a85e000..842a85e000 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 8a3923b351..8a3923b351 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index e52692fbf4..e52692fbf4 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml
index e21261d8d0..e21261d8d0 100644
--- a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/trunk/itest/services/src/main/resources/ServicesTest.composite
index e7d56032ea..e7d56032ea 100644
--- a/java/sca/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/trunk/itest/services/src/main/resources/ServicesTest.composite
diff --git a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index da779b2c54..da779b2c54 100644
--- a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/java/sca/itest/wires/pom.xml b/sca-java-2.x/trunk/itest/wires/pom.xml
index 73868c649e..73868c649e 100644
--- a/java/sca/itest/wires/pom.xml
+++ b/sca-java-2.x/trunk/itest/wires/pom.xml
diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/java/sca/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/trunk/itest/wires/src/main/resources/WireTest.composite
index 614beaec00..614beaec00 100644
--- a/java/sca/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/trunk/itest/wires/src/main/resources/WireTest.composite
diff --git a/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java