Moving 2.x contribs

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

1997 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/itest/admin/README b/sca-java-2.x/contrib/itest/admin/README
index c4e96d7af0..c4e96d7af0 100644
--- a/java/sca-contrib/itest/admin/README
+++ b/sca-java-2.x/contrib/itest/admin/README
diff --git a/java/sca-contrib/itest/admin/pom.xml b/sca-java-2.x/contrib/itest/admin/pom.xml
index e179926bf1..e179926bf1 100644
--- a/java/sca-contrib/itest/admin/pom.xml
+++ b/sca-java-2.x/contrib/itest/admin/pom.xml
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
index f081537dab..f081537dab 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
index b4224e286e..b4224e286e 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
index 550303d856..550303d856 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
index 8ff146b630..8ff146b630 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
index 638c6aff8c..638c6aff8c 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
index 344d0cb6b5..344d0cb6b5 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
index 9789726156..9789726156 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
index eec64fa0d8..eec64fa0d8 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
index dbb190beee..dbb190beee 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
diff --git a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
index 42fa3f0c41..42fa3f0c41 100644
--- a/java/sca-contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ b/sca-java-2.x/contrib/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
index bcf4153064..bcf4153064 100644
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
index 747f71576c..747f71576c 100644
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
diff --git a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
index 6c2dffb7b4..6c2dffb7b4 100644
--- a/java/sca-contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
diff --git a/java/sca-contrib/itest/admin/src/test/resources/Iteration1Composite.composite b/sca-java-2.x/contrib/itest/admin/src/test/resources/Iteration1Composite.composite
index 95dbbf0124..95dbbf0124 100644
--- a/java/sca-contrib/itest/admin/src/test/resources/Iteration1Composite.composite
+++ b/sca-java-2.x/contrib/itest/admin/src/test/resources/Iteration1Composite.composite
diff --git a/java/sca-contrib/itest/admin/src/test/resources/Iteration3Composite.composite b/sca-java-2.x/contrib/itest/admin/src/test/resources/Iteration3Composite.composite
index dd06d030d6..dd06d030d6 100644
--- a/java/sca-contrib/itest/admin/src/test/resources/Iteration3Composite.composite
+++ b/sca-java-2.x/contrib/itest/admin/src/test/resources/Iteration3Composite.composite
diff --git a/java/sca-contrib/itest/admin/src/test/resources/MySimpleService.composite b/sca-java-2.x/contrib/itest/admin/src/test/resources/MySimpleService.composite
index a1f8abb8da..a1f8abb8da 100644
--- a/java/sca-contrib/itest/admin/src/test/resources/MySimpleService.composite
+++ b/sca-java-2.x/contrib/itest/admin/src/test/resources/MySimpleService.composite
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/pom.xml b/sca-java-2.x/contrib/itest/binding-sca-jms/client/pom.xml
index 2e24179309..2e24179309 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/pom.xml
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/pom.xml
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
index 3a546dcf72..3a546dcf72 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
index b1daa53c86..b1daa53c86 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
index 81aa3ed98d..81aa3ed98d 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
diff --git a/java/sca-contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
index 5c56dbaf84..5c56dbaf84 100644
--- a/java/sca-contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
diff --git a/java/sca-contrib/itest/binding-sca-jms/pom.xml b/sca-java-2.x/contrib/itest/binding-sca-jms/pom.xml
index 9da74604f5..9da74604f5 100644
--- a/java/sca-contrib/itest/binding-sca-jms/pom.xml
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/pom.xml
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/pom.xml b/sca-java-2.x/contrib/itest/binding-sca-jms/service/pom.xml
index 5b0677b0e6..5b0677b0e6 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/pom.xml
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/pom.xml
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
index b1daa53c86..b1daa53c86 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
index d0f8dcc393..d0f8dcc393 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite
index 03ac786809..03ac786809 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/main/resources/MyService.composite
diff --git a/java/sca-contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
index cb79ae050a..cb79ae050a 100644
--- a/java/sca-contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/pom.xml
index 1e662708d7..1e662708d7 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/pom.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index d7dff093f9..d7dff093f9 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 5ecf5494be..5ecf5494be 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 8dea2715bf..8dea2715bf 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index f46893481b..f46893481b 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index a687534bb2..a687534bb2 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index bdfedee2f8..bdfedee2f8 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index dfec43e8e1..dfec43e8e1 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
index 25d676bcfc..25d676bcfc 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index 5ec2cc9f2e..5ec2cc9f2e 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
index 13d12e32a0..13d12e32a0 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 504e2ccc5d..504e2ccc5d 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..0f51b96b27 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/java/sca-contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/pom.xml
index a676177e56..a676177e56 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/pom.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 6971151a77..6971151a77 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f864f45613..f864f45613 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/java/sca-contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/java/sca-contrib/itest/bpel/helloworld/pom.xml b/sca-java-2.x/contrib/itest/bpel/helloworld/pom.xml
index 9eae937361..9eae937361 100644
--- a/java/sca-contrib/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/pom.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 76fcd35c2d..76fcd35c2d 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index f6b12fb14b..f6b12fb14b 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/java/sca-contrib/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/contrib/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/java/sca-contrib/itest/bpel/pom.xml b/sca-java-2.x/contrib/itest/bpel/pom.xml
index d6909735db..d6909735db 100644
--- a/java/sca-contrib/itest/bpel/pom.xml
+++ b/sca-java-2.x/contrib/itest/bpel/pom.xml
diff --git a/java/sca-contrib/itest/builder/pom.xml b/sca-java-2.x/contrib/itest/builder/pom.xml
index b8dfd95783..b8dfd95783 100644
--- a/java/sca-contrib/itest/builder/pom.xml
+++ b/sca-java-2.x/contrib/itest/builder/pom.xml
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index fb23a4e60f..fb23a4e60f 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index 5ee020e181..5ee020e181 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index 2d8a37d5f0..2d8a37d5f0 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index 4fdaac1fb1..4fdaac1fb1 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index 1feb08b876..1feb08b876 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 3a872376ea..3a872376ea 100644
--- a/java/sca-contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/contrib/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 256d01be58..256d01be58 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
index 5c2a98ab40..5c2a98ab40 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 21b5897aa1..21b5897aa1 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index 083079ba42..083079ba42 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
index c24b7f0046..c24b7f0046 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 27a73d5c41..27a73d5c41 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index a6e4b65970..a6e4b65970 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
index 3a94152e6a..3a94152e6a 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 6130c68651..6130c68651 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 125bdc5e53..125bdc5e53 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
index aabd445e23..aabd445e23 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2ccc47c28..a2ccc47c28 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index c906c6c5b0..c906c6c5b0 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
index ed59cd2adf..ed59cd2adf 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 41150f78fd..41150f78fd 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index 6fa901c4df..6fa901c4df 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
index 66f88294ff..66f88294ff 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
index db1af4743f..db1af4743f 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index f5899ab1f0..f5899ab1f0 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
index 4b37c19e4e..4b37c19e4e 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
index fedd79ff3d..fedd79ff3d 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index 642245ea7e..642245ea7e 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
index 1bb876b33d..1bb876b33d 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 55e13700a6..55e13700a6 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 92da17179f..92da17179f 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
index 403e19b087..403e19b087 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 0e37ded0e4..0e37ded0e4 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 42d45b0b98..42d45b0b98 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
index 1c89139905..1c89139905 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 853703a353..853703a353 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index 44c471cc65..44c471cc65 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
index 6b1ac24cec..6b1ac24cec 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 8e0cebbdd5..8e0cebbdd5 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7cb09d0a74..7cb09d0a74 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
index 26e5ee33fa..26e5ee33fa 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 4fa0712199..4fa0712199 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index 6e0908702b..6e0908702b 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
index 3fce35470e..3fce35470e 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 6e86c547b3..6e86c547b3 100644
--- a/java/sca-contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/contrib/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 1f45cb4a66..1f45cb4a66 100644
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
index c9339c1545..c9339c1545 100644
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 5f5fe43d89..5f5fe43d89 100644
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index 9bff4d394e..9bff4d394e 100644
--- a/java/sca-contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/contrib/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/pom.xml b/sca-java-2.x/contrib/itest/callablereferences-ws/pom.xml
index a231c4d741..a231c4d741 100644
--- a/java/sca-contrib/itest/callablereferences-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/pom.xml
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
index ecf1ac27e1..ecf1ac27e1 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
index 9a486b3be0..9a486b3be0 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
index 9264def0dc..9264def0dc 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
index 22aecc8b27..22aecc8b27 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
index 6ecf3d662e..6ecf3d662e 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
index 64a11f0bf3..64a11f0bf3 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
index 9861b0a85e..9861b0a85e 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
index c870cd87fe..c870cd87fe 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
index ee9d0f0b26..ee9d0f0b26 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
index 9a4f31d79d..9a4f31d79d 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
index 3d782a0b84..3d782a0b84 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/resources/example.composite
index ea0819a32e..ea0819a32e 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/main/resources/example.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
index 310e31fb02..310e31fb02 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/java/sca-contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-2.x/contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
index 66fb2ef96c..66fb2ef96c 100644
--- a/java/sca-contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/java/sca-contrib/itest/callablereferences/pom.xml b/sca-java-2.x/contrib/itest/callablereferences/pom.xml
index ae12f41535..ae12f41535 100644
--- a/java/sca-contrib/itest/callablereferences/pom.xml
+++ b/sca-java-2.x/contrib/itest/callablereferences/pom.xml
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index 33783be887..33783be887 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index f99051cd5f..f99051cd5f 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index 1cf3029d82..1cf3029d82 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 084572b6e5..084572b6e5 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index 059f42c4d3..059f42c4d3 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index 76fdd61191..76fdd61191 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index 8b2988b700..8b2988b700 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index a43b3818c5..a43b3818c5 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
index 33bc49e4d8..33bc49e4d8 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
index 36bafba562..36bafba562 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
index bf5a2e65cc..bf5a2e65cc 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
index 59fed12279..59fed12279 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
index b8dd1c5640..b8dd1c5640 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
index 8425425c16..8425425c16 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
index 445fb7bf7f..445fb7bf7f 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
index 0670629bae..0670629bae 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
index 0bf8f7ef1e..0bf8f7ef1e 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
index 5b3add1e61..5b3add1e61 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
index 9216f44191..9216f44191 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 95021f72a4..95021f72a4 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
index 42d739564c..42d739564c 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 2edda61601..2edda61601 100644
--- a/java/sca-contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
index fb3a5d79b9..fb3a5d79b9 100644
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index 927e91a8bc..927e91a8bc 100644
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
index f2d8fe5d64..f2d8fe5d64 100644
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index d785a6a397..d785a6a397 100644
--- a/java/sca-contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-2.x/contrib/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/pom.xml
index 55076f0f5e..55076f0f5e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 8cadb2420e..8cadb2420e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 6a4bb82953..6a4bb82953 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index 3c88ac9272..3c88ac9272 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index e8342ee7b9..e8342ee7b9 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index cf016617a6..cf016617a6 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e81a11e55a..e81a11e55a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/pom.xml
index dfa0efd5d5..dfa0efd5d5 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 18fc2bbc88..18fc2bbc88 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index 9918ce8fca..9918ce8fca 100644
--- a/java/sca-contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-classloader/pom.xml b/sca-java-2.x/contrib/itest/contribution-classloader/pom.xml
index 7e94f897b8..7e94f897b8 100644
--- a/java/sca-contrib/itest/contribution-classloader/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-classloader/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/pom.xml
index 094987318a..094987318a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 32b024bccb..32b024bccb 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 0c60e62d35..0c60e62d35 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/pom.xml
index 7050d77a67..7050d77a67 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/pom.xml
index 1202328b00..1202328b00 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/pom.xml
index 51f9efd932..51f9efd932 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/java/sca-contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/pom.xml
index be3d2f1fb0..be3d2f1fb0 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 05bd7b7138..05bd7b7138 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/pom.xml
index 13d9a7ce58..13d9a7ce58 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/pom.xml
index 6adf9effe5..6adf9effe5 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/pom.xml
index 265376216b..265376216b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 134da7e34b..134da7e34b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/java/sca-contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/itest/contribution-import-export/pom.xml b/sca-java-2.x/contrib/itest/contribution-import-export/pom.xml
index 36858e953e..36858e953e 100644
--- a/java/sca-contrib/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-import-export/pom.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/pom.xml b/sca-java-2.x/contrib/itest/contribution-multiple/pom.xml
index 5ff78b3d48..5ff78b3d48 100644
--- a/java/sca-contrib/itest/contribution-multiple/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/pom.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
index 7e574a7db3..7e574a7db3 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index 7cd950453d..7cd950453d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index e90d10dc24..e90d10dc24 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index 5251fc0a45..5251fc0a45 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
index 133c98f357..133c98f357 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index 790b6fed98..790b6fed98 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
index cbabdcd4fc..cbabdcd4fc 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
index 4c9225de34..4c9225de34 100644
--- a/java/sca-contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ b/sca-java-2.x/contrib/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
diff --git a/java/sca-contrib/itest/contribution/pom.xml b/sca-java-2.x/contrib/itest/contribution/pom.xml
index 1fe5207ad5..1fe5207ad5 100644
--- a/java/sca-contrib/itest/contribution/pom.xml
+++ b/sca-java-2.x/contrib/itest/contribution/pom.xml
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 719ad69eef..719ad69eef 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-2.x/contrib/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/java/sca-contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-2.x/contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/java/sca-contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/java/sca-contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/java/sca-contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/contrib/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/java/sca-contrib/itest/conversations-ws/pom.xml b/sca-java-2.x/contrib/itest/conversations-ws/pom.xml
index 2789d3eee7..2789d3eee7 100644
--- a/java/sca-contrib/itest/conversations-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/conversations-ws/pom.xml
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 9cd88620e3..9cd88620e3 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index b6c694c8a9..b6c694c8a9 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index b6645aec23..b6645aec23 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 772602568c..772602568c 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 481ed7b388..481ed7b388 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index c9d46b9072..c9d46b9072 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b46cb831df..b46cb831df 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 4c3809676c..4c3809676c 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 2d048a76b5..2d048a76b5 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index 34b8fbe9d0..34b8fbe9d0 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 0d3ca8d350..0d3ca8d350 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index db3bcabe02..db3bcabe02 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index e25f367cf6..e25f367cf6 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 3ac259ed7c..3ac259ed7c 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 1abe9e51c3..1abe9e51c3 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index fc485b6c4b..fc485b6c4b 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index a783e79cae..a783e79cae 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 5f34de66b3..5f34de66b3 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 02a2fb1d4d..02a2fb1d4d 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 4550e3eaa1..4550e3eaa1 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index d5a1ff7410..d5a1ff7410 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index c4da99145d..c4da99145d 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index 73d078674c..73d078674c 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 9c6b0a2b34..9c6b0a2b34 100644
--- a/java/sca-contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 6c3cbe462c..6c3cbe462c 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index 051b6b9fc1..051b6b9fc1 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index b9530c132b..b9530c132b 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 1e5f6adcf1..1e5f6adcf1 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 8a110477b5..8a110477b5 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index 79ac9262c6..79ac9262c6 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 9aebae9ced..9aebae9ced 100644
--- a/java/sca-contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-2.x/contrib/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/java/sca-contrib/itest/corba/pom.xml b/sca-java-2.x/contrib/itest/corba/pom.xml
index f1dd2a9187..f1dd2a9187 100644
--- a/java/sca-contrib/itest/corba/pom.xml
+++ b/sca-java-2.x/contrib/itest/corba/pom.xml
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 46e214eac3..46e214eac3 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index cba8c823e8..cba8c823e8 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 0135c04495..0135c04495 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index b7309d68a0..b7309d68a0 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index a738c6f211..a738c6f211 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index 008212bdbe..008212bdbe 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index c25372c837..c25372c837 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index abcec43d0e..abcec43d0e 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 171a7919a2..171a7919a2 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 5f2dc56033..5f2dc56033 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 24a628d406..24a628d406 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index da37f28e39..da37f28e39 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index 7b2466f791..7b2466f791 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 27052a1549..27052a1549 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 57daa51f42..57daa51f42 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 88fef0b4fb..88fef0b4fb 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index 40c017dd29..40c017dd29 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index 6ec067521e..6ec067521e 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index 8955f81694..8955f81694 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index 940b391499..940b391499 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 63a11dc56a..63a11dc56a 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8c0bfc9e39..8c0bfc9e39 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index 72ff55a711..72ff55a711 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index 8a063b8b9d..8a063b8b9d 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index 4a3376c476..4a3376c476 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 9b89d7f98a..9b89d7f98a 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index 3c1a1c9a83..3c1a1c9a83 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 13f294b871..13f294b871 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 66cc1d1e82..66cc1d1e82 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index f14394b400..f14394b400 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 56388624d7..56388624d7 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 1897d0682c..1897d0682c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index c8c88ef91d..c8c88ef91d 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 5540b98c21..5540b98c21 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index 648144299c..648144299c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index f2cc3adad5..f2cc3adad5 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index dbad550222..dbad550222 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index d29129236c..d29129236c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index 837ba04cea..837ba04cea 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 0b24056642..0b24056642 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index e2ed1ab037..e2ed1ab037 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 46888399ed..46888399ed 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index c276038050..c276038050 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 079a56b446..079a56b446 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 0407184598..0407184598 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index 16e099cfa3..16e099cfa3 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index b4883cb35c..b4883cb35c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index c96fb61204..c96fb61204 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 3427c127ec..3427c127ec 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 78464fe40d..78464fe40d 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index faff36c2a4..faff36c2a4 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 1bc2156183..1bc2156183 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a198eaf646..a198eaf646 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aa2f06909b..aa2f06909b 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index c7569720f0..c7569720f0 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 1813de4e67..1813de4e67 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index 6f0ef584da..6f0ef584da 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index f2baffce9a..f2baffce9a 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index 8270ba1a8c..8270ba1a8c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index ac7b0af175..ac7b0af175 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 0e894cb7ea..0e894cb7ea 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 13bc1d499e..13bc1d499e 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 12b0f404ae..12b0f404ae 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index 937d82b33e..937d82b33e 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/java/sca-contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-2.x/contrib/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/java/sca-contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioFive.composite
index 3c73e238a5..3c73e238a5 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioFour.composite
index 01d7e2314a..01d7e2314a 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioOne.composite
index c10b383661..c10b383661 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioSix.composite
index 88238478c1..88238478c1 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioThree.composite
index f43e4a3f7a..f43e4a3f7a 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioTwo.composite
index dc5ddc50d3..dc5ddc50d3 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/java/sca-contrib/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/contrib/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/java/sca-contrib/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/contrib/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/java/sca-contrib/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-2.x/contrib/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/java/sca-contrib/itest/databindings/common/pom.xml b/sca-java-2.x/contrib/itest/databindings/common/pom.xml
index 661b264a49..661b264a49 100644
--- a/java/sca-contrib/itest/databindings/common/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/pom.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-2.x/contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index adb546a1ea..adb546a1ea 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index db24ceab14..db24ceab14 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index 2df4a558e6..2df4a558e6 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index b73173247f..b73173247f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index 46c74ec819..46c74ec819 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 2fd10ef0bf..2fd10ef0bf 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 5d27ef5ce1..5d27ef5ce1 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index ec16a678a3..ec16a678a3 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index ed681009f9..ed681009f9 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index ea35bec61a..ea35bec61a 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 57981e3666..57981e3666 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/java/sca-contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/java/sca-contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-2.x/contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/java/sca-contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/java/sca-contrib/itest/databindings/config.png b/sca-java-2.x/contrib/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/java/sca-contrib/itest/databindings/config.png
+++ b/sca-java-2.x/contrib/itest/databindings/config.png
diff --git a/java/sca-contrib/itest/databindings/config.svg b/sca-java-2.x/contrib/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/java/sca-contrib/itest/databindings/config.svg
+++ b/sca-java-2.x/contrib/itest/databindings/config.svg
diff --git a/java/sca-contrib/itest/databindings/databinding.png b/sca-java-2.x/contrib/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/java/sca-contrib/itest/databindings/databinding.png
+++ b/sca-java-2.x/contrib/itest/databindings/databinding.png
diff --git a/java/sca-contrib/itest/databindings/databinding.svg b/sca-java-2.x/contrib/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/java/sca-contrib/itest/databindings/databinding.svg
+++ b/sca-java-2.x/contrib/itest/databindings/databinding.svg
diff --git a/java/sca-contrib/itest/databindings/interop.png b/sca-java-2.x/contrib/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/java/sca-contrib/itest/databindings/interop.png
+++ b/sca-java-2.x/contrib/itest/databindings/interop.png
diff --git a/java/sca-contrib/itest/databindings/interop.svg b/sca-java-2.x/contrib/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/java/sca-contrib/itest/databindings/interop.svg
+++ b/sca-java-2.x/contrib/itest/databindings/interop.svg
diff --git a/java/sca-contrib/itest/databindings/interop/pom.xml b/sca-java-2.x/contrib/itest/databindings/interop/pom.xml
index a8f7635183..a8f7635183 100644
--- a/java/sca-contrib/itest/databindings/interop/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/interop/pom.xml
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/java/sca-contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-2.x/contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/pom.xml
index 45e5720602..45e5720602 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 5d389643cc..5d389643cc 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 52f1c01fd8..52f1c01fd8 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index 7529c2b841..7529c2b841 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 844e28863a..844e28863a 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index be446c9759..be446c9759 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index df9e6e53ec..df9e6e53ec 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..23ed57dec9 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 690a2adb3d..690a2adb3d 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 3b9690b7d2..3b9690b7d2 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 2f3bd3f2cb..2f3bd3f2cb 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 078be8896e..078be8896e 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 4d451e6d32..4d451e6d32 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index d520e64881..d520e64881 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 27dc25289e..27dc25289e 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 37b3f1b680..37b3f1b680 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index 44b6e9d906..44b6e9d906 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 5c389bf67f..5c389bf67f 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index eea19521c4..eea19521c4 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 263d1212ca..263d1212ca 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 9e14140752..9e14140752 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 3ceee3c4b1..3ceee3c4b1 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 6aefb05c83..6aefb05c83 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 42fb9cbac2..42fb9cbac2 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 5ecbb9edee..5ecbb9edee 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index 2d47ba7b14..2d47ba7b14 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index c39cf21002..c39cf21002 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 4b0a6e215d..4b0a6e215d 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 13ef73c082..13ef73c082 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 4967b896a5..4967b896a5 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 744bf20494..744bf20494 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index c22d00140e..c22d00140e 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index f8aaad3dac..f8aaad3dac 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 2d023ab448..2d023ab448 100644
--- a/java/sca-contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/pom.xml
index 4e3fcfbe5c..4e3fcfbe5c 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/pom.xml
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index ab2d9630eb..ab2d9630eb 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index ac6c8d5a60..ac6c8d5a60 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 1f3b7ec633..1f3b7ec633 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index 61449c8981..61449c8981 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index c0868f0146..c0868f0146 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index e55d2527f4..e55d2527f4 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 72ff27b85e..72ff27b85e 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index b3d3c3eb3a..b3d3c3eb3a 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index b58d04a04c..b58d04a04c 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 926e4154aa..926e4154aa 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index 63151f6a2d..63151f6a2d 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index f366783e5e..f366783e5e 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 85ca6d0789..85ca6d0789 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index 4788df78e0..4788df78e0 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 5bfd1ea277..5bfd1ea277 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 35f69608e7..35f69608e7 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 4a292a8b7a..4a292a8b7a 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 263b2f81eb..263b2f81eb 100644
--- a/java/sca-contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/pom.xml b/sca-java-2.x/contrib/itest/databindings/jaxbgen/pom.xml
index fb88bcfff1..fb88bcfff1 100644
--- a/java/sca-contrib/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/jaxbgen/pom.xml
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-2.x/contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-2.x/contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/java/sca-contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-2.x/contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/java/sca-contrib/itest/databindings/pom.xml b/sca-java-2.x/contrib/itest/databindings/pom.xml
index 43f99aff39..43f99aff39 100644
--- a/java/sca-contrib/itest/databindings/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/pom.xml
diff --git a/java/sca-contrib/itest/databindings/readme.html b/sca-java-2.x/contrib/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/java/sca-contrib/itest/databindings/readme.html
+++ b/sca-java-2.x/contrib/itest/databindings/readme.html
diff --git a/java/sca-contrib/itest/databindings/sdogen/pom.xml b/sca-java-2.x/contrib/itest/databindings/sdogen/pom.xml
index e8a27753cf..e8a27753cf 100644
--- a/java/sca-contrib/itest/databindings/sdogen/pom.xml
+++ b/sca-java-2.x/contrib/itest/databindings/sdogen/pom.xml
diff --git a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-2.x/contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-2.x/contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-2.x/contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/java/sca-contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-2.x/contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/java/sca-contrib/itest/definitions-multiple/pom.xml b/sca-java-2.x/contrib/itest/definitions-multiple/pom.xml
index 0d8d8cb828..0d8d8cb828 100644
--- a/java/sca-contrib/itest/definitions-multiple/pom.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/pom.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java
index 198a38b657..198a38b657 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java
index b4a797e597..b4a797e597 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java
index 8f4c675370..8f4c675370 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/PolicyQNames.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml
index 6371eaebd9..6371eaebd9 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/resources/contrib3/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml
index 7d9e029f57..7d9e029f57 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/main/resources/contrib3/definitions.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java
index 31c616e988..31c616e988 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/MultipleDefinitionsTestCase.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index 5196e2f215..5196e2f215 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite
index e49717dbe8..e49717dbe8 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/Calculator.composite
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml
index 00d7793198..00d7793198 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml
index 07756b50b4..07756b50b4 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml
index 84f8e8a3c9..84f8e8a3c9 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib1/definitions/definitions.xml
diff --git a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml
index 439b7bbbe8..439b7bbbe8 100644
--- a/java/sca-contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml
+++ b/sca-java-2.x/contrib/itest/definitions-multiple/src/test/resources/contrib2/definitions.xml
diff --git a/java/sca-contrib/itest/domain/pom.xml b/sca-java-2.x/contrib/itest/domain/pom.xml
index b1fe80ff47..b1fe80ff47 100644
--- a/java/sca-contrib/itest/domain/pom.xml
+++ b/sca-java-2.x/contrib/itest/domain/pom.xml
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddService.java
index 138213b5fc..138213b5fc 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java
index 1a63d4ff77..1a63d4ff77 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
index 93486d915e..93486d915e 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
index 6250563a09..6250563a09 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/SubtractService.java
index be3f1a61fc..be3f1a61fc 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
index abf2777c7d..abf2777c7d 100644
--- a/java/sca-contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionA/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionA/Calculator.composite
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite
index df00387b23..df00387b23 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionDependent/Calculator.composite
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
index 8264a8243f..8264a8243f 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
index 92d069c6c9..92d069c6c9 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
diff --git a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
index e53c14a651..e53c14a651 100644
--- a/java/sca-contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/sca-java-2.x/contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
index 98f13df774..98f13df774 100644
--- a/java/sca-contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ b/sca-java-2.x/contrib/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/pom.xml
index 69be53cfe7..69be53cfe7 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index ffef7a4d71..ffef7a4d71 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 95496e1737..95496e1737 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 1147b4c715..1147b4c715 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index aba83723bb..aba83723bb 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index 4ee01fa303..4ee01fa303 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 460edab182..460edab182 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 3e9febb6bc..3e9febb6bc 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/pom.xml b/sca-java-2.x/contrib/itest/exceptions-cross-binding/pom.xml
index 140b1f352d..140b1f352d 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/pom.xml
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index 456cf07116..456cf07116 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index ed2a287bcc..ed2a287bcc 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 32ba65bd6b..32ba65bd6b 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 5fe40935ec..5fe40935ec 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index 4ee01fa303..4ee01fa303 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/java/sca-contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index e65a1d4b64..e65a1d4b64 100644
--- a/java/sca-contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-2.x/contrib/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/pom.xml b/sca-java-2.x/contrib/itest/exceptions-simple-ws/pom.xml
index 5e68bb3640..5e68bb3640 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/pom.xml
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
index 1b597984e5..1b597984e5 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
index 5e80b7bdde..5e80b7bdde 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
index 35f55b525a..35f55b525a 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
index 1e887995dd..1e887995dd 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
index 2a305913c8..2a305913c8 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
index 728be51428..728be51428 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/resources/example.composite
index 505132277c..505132277c 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
index 628e6ca6ba..628e6ca6ba 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
index 7310a0f1e7..7310a0f1e7 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
diff --git a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/java/sca-contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/contrib/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/java/sca-contrib/itest/extended-api/pom.xml b/sca-java-2.x/contrib/itest/extended-api/pom.xml
index fc857f21e1..fc857f21e1 100644
--- a/java/sca-contrib/itest/extended-api/pom.xml
+++ b/sca-java-2.x/contrib/itest/extended-api/pom.xml
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index b716c0dd07..b716c0dd07 100644
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index 869f951342..869f951342 100644
--- a/java/sca-contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/java/sca-contrib/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-2.x/contrib/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/java/sca-contrib/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/java/sca-contrib/itest/extended-api/src/main/resources/MathService.composite b/sca-java-2.x/contrib/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/java/sca-contrib/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-2.x/contrib/itest/extended-api/src/main/resources/MathService.composite
diff --git a/java/sca-contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-2.x/contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index d0f20f98fc..d0f20f98fc 100644
--- a/java/sca-contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-2.x/contrib/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/java/sca-contrib/itest/interop-soap-client/pom.xml b/sca-java-2.x/contrib/itest/interop-soap-client/pom.xml
index 2fdc43ea32..2fdc43ea32 100644
--- a/java/sca-contrib/itest/interop-soap-client/pom.xml
+++ b/sca-java-2.x/contrib/itest/interop-soap-client/pom.xml
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
index f210545130..f210545130 100644
--- a/java/sca-contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/resources/default.composite
index 7fd5cc0d65..7fd5cc0d65 100644
--- a/java/sca-contrib/itest/interop-soap-client/src/main/resources/default.composite
+++ b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/resources/default.composite
diff --git a/java/sca-contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
index 90d8a754b4..90d8a754b4 100644
--- a/java/sca-contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-2.x/contrib/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/java/sca-contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-2.x/contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
index dc1ba48580..dc1ba48580 100644
--- a/java/sca-contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/pom.xml b/sca-java-2.x/contrib/itest/interop-soap-round2-client/pom.xml
index 2757b21632..2757b21632 100644
--- a/java/sca-contrib/itest/interop-soap-round2-client/pom.xml
+++ b/sca-java-2.x/contrib/itest/interop-soap-round2-client/pom.xml
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
index ca3031c646..ca3031c646 100644
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/resources/default.composite
index 9bde77ef37..9bde77ef37 100644
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/resources/default.composite
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
index e08039cedb..e08039cedb 100644
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/java/sca-contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
index 251f64bd6b..251f64bd6b 100644
--- a/java/sca-contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ b/sca-java-2.x/contrib/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/java/sca-contrib/itest/interop-soap-service/pom.xml b/sca-java-2.x/contrib/itest/interop-soap-service/pom.xml
index b72a0b89dd..b72a0b89dd 100644
--- a/java/sca-contrib/itest/interop-soap-service/pom.xml
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/pom.xml
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
index 9892828ca2..9892828ca2 100644
--- a/java/sca-contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/java/sca-contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
index 3fbc73616e..3fbc73616e 100644
--- a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
index 8cf95fb789..8cf95fb789 100644
--- a/java/sca-contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/itest/interop-soap-service/t.bat b/sca-java-2.x/contrib/itest/interop-soap-service/t.bat
index 0f83dedc37..0f83dedc37 100755
--- a/java/sca-contrib/itest/interop-soap-service/t.bat
+++ b/sca-java-2.x/contrib/itest/interop-soap-service/t.bat
diff --git a/java/sca-contrib/itest/jms-args/pom.xml b/sca-java-2.x/contrib/itest/jms-args/pom.xml
index dbddf929af..dbddf929af 100644
--- a/java/sca-contrib/itest/jms-args/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-args/pom.xml
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/java/sca-contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca-contrib/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/java/sca-contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/contrib/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/java/sca-contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/java/sca-contrib/itest/jms-callbacks/pom.xml b/sca-java-2.x/contrib/itest/jms-callbacks/pom.xml
index ceb8d128b2..ceb8d128b2 100644
--- a/java/sca-contrib/itest/jms-callbacks/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/pom.xml
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index a4d5190af3..a4d5190af3 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index e8357338ae..e8357338ae 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/java/sca-contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/java/sca-contrib/itest/jms-definitions/pom.xml b/sca-java-2.x/contrib/itest/jms-definitions/pom.xml
index 5f594ea957..5f594ea957 100644
--- a/java/sca-contrib/itest/jms-definitions/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-definitions/pom.xml
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions.xml
index ff389c7014..ff389c7014 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/java/sca-contrib/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/java/sca-contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/pom.xml b/sca-java-2.x/contrib/itest/jms-format/pom.xml
index d9168ee4e6..d9168ee4e6 100644
--- a/java/sca-contrib/itest/jms-format/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-format/pom.xml
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 646cecc2b7..646cecc2b7 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 25a7e36fce..25a7e36fce 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index f5596df894..f5596df894 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index f0b7819c3b..f0b7819c3b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
index 735725e9c2..735725e9c2 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
index c2c991f857..c2c991f857 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
index 2fb1c49685..2fb1c49685 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
index 72ae0a330e..72ae0a330e 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index e67f2ba8fa..e67f2ba8fa 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 21b4d0461e..21b4d0461e 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index 43e623f192..43e623f192 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index 2956df755b..2956df755b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index feee945ccd..feee945ccd 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index d266735183..d266735183 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 3444789d01..3444789d01 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index f42a1e2de1..f42a1e2de1 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e1706dbe6b..e1706dbe6b 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index a58cb87714..a58cb87714 100644
--- a/java/sca-contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
index ef66c5583c..ef66c5583c 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
index f487996324..f487996324 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsdelimited/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
index f487996324..f487996324 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
index 07507e0ebe..07507e0ebe 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
index 3cd1238c79..3cd1238c79 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jmstextxml/messages.xml
diff --git a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/java/sca-contrib/itest/jms-format/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-format/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 3d40d4fa85..3d40d4fa85 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
index 90b74146e5..90b74146e5 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDelimitedTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index 18955df933..18955df933 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 944e8e5905..944e8e5905 100644
--- a/java/sca-contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/java/sca-contrib/itest/jms-selectors/pom.xml b/sca-java-2.x/contrib/itest/jms-selectors/pom.xml
index 5c0a61bf3e..5c0a61bf3e 100644
--- a/java/sca-contrib/itest/jms-selectors/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms-selectors/pom.xml
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/java/sca-contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/java/sca-contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/java/sca-contrib/itest/jms/pom.xml b/sca-java-2.x/contrib/itest/jms/pom.xml
index 49081dc48f..49081dc48f 100644
--- a/java/sca-contrib/itest/jms/pom.xml
+++ b/sca-java-2.x/contrib/itest/jms/pom.xml
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 0643fc8376..0643fc8376 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 2c9e822ac1..2c9e822ac1 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index ab293a5df1..ab293a5df1 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 65a4b32694..65a4b32694 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 33298eb555..33298eb555 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 6ec88aac6c..6ec88aac6c 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index fc155d0324..fc155d0324 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 8fd6cc94bf..8fd6cc94bf 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index 80368a0fb6..80368a0fb6 100644
--- a/java/sca-contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-2.x/contrib/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/defaults/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/external/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/external/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
index 1baa4af6b4..1baa4af6b4 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
index dd4350c6fe..dd4350c6fe 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/definitions.xml
diff --git a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
index 6fb6330a21..6fb6330a21 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/properties/properties.composite
index 43bd611b24..43bd611b24 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/properties/properties.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/client.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..69c0ef305e 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/service.composite
index 2ab92923f6..2ab92923f6 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/service.composite
diff --git a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/java/sca-contrib/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/contrib/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index ba3e697e13..ba3e697e13 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index fc47211f46..fc47211f46 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index c0c90cea95..c0c90cea95 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 4cc229422e..4cc229422e 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/java/sca-contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/contrib/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/java/sca-contrib/itest/large-sdo-ws/pom.xml b/sca-java-2.x/contrib/itest/large-sdo-ws/pom.xml
index c670bd9ec4..c670bd9ec4 100644
--- a/java/sca-contrib/itest/large-sdo-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/pom.xml
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
index f5a8830c4a..f5a8830c4a 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
index 14da53cf98..14da53cf98 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
index b661f0c518..b661f0c518 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
index ac66b6a425..ac66b6a425 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite
index 97594216e1..97594216e1 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/trnInq.composite
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
index b85b80abc4..b85b80abc4 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
index 842f7a9d4c..842f7a9d4c 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
diff --git a/java/sca-contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-2.x/contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
index 17eb575d50..17eb575d50 100644
--- a/java/sca-contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/pom.xml b/sca-java-2.x/contrib/itest/late-reference-resolution/pom.xml
index c4970cc786..c4970cc786 100644
--- a/java/sca-contrib/itest/late-reference-resolution/pom.xml
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/pom.xml
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
index c927500cc7..c927500cc7 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
index f03b9b94d4..f03b9b94d4 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index c53b55aacf..c53b55aacf 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
index 378d6e9706..378d6e9706 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
index 3fb16fa619..3fb16fa619 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
index c615b4355a..c615b4355a 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
index e4bd3035e2..e4bd3035e2 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
index c6e0689837..c6e0689837 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index 74e01259e2..74e01259e2 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
diff --git a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
index 57afc9ea50..57afc9ea50 100644
--- a/java/sca-contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ b/sca-java-2.x/contrib/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
diff --git a/java/sca-contrib/itest/oneway/build.xml b/sca-java-2.x/contrib/itest/oneway/build.xml
index e6b8f2e51f..e6b8f2e51f 100644
--- a/java/sca-contrib/itest/oneway/build.xml
+++ b/sca-java-2.x/contrib/itest/oneway/build.xml
diff --git a/java/sca-contrib/itest/oneway/pom.xml b/sca-java-2.x/contrib/itest/oneway/pom.xml
index f28cf2a577..f28cf2a577 100644
--- a/java/sca-contrib/itest/oneway/pom.xml
+++ b/sca-java-2.x/contrib/itest/oneway/pom.xml
diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index babbfbc91b..babbfbc91b 100644
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index 80c339abd6..80c339abd6 100644
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index d941693f46..d941693f46 100644
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 8dad4d669b..8dad4d669b 100644
--- a/java/sca-contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/java/sca-contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-2.x/contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index d053a6278c..d053a6278c 100644
--- a/java/sca-contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-2.x/contrib/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/java/sca-contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index a088b2090f..a088b2090f 100644
--- a/java/sca-contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-2.x/contrib/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml
index a26e309cbc..a26e309cbc 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
index b70ddede4f..b70ddede4f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 34b1b0e94f..34b1b0e94f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index aa91ef663c..aa91ef663c 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 32015b9b60..32015b9b60 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index c904f07693..c904f07693 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
index 7edc392f46..7edc392f46 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
index 7edc392f46..7edc392f46 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
index 4779eff514..4779eff514 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
index d505834f15..d505834f15 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
index 6bcf6cef0a..6bcf6cef0a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
index e23e1a2ecd..e23e1a2ecd 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
index 9832da880e..9832da880e 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
index 5586179421..5586179421 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
index 644b207e70..644b207e70 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
index e649870356..e649870356 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
index 8e8e33ecd1..8e8e33ecd1 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
index 5f4a8b94ec..5f4a8b94ec 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
index 57d2ac9e4d..57d2ac9e4d 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
index 2e1399bb3b..2e1399bb3b 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
index bb8fb2b07c..bb8fb2b07c 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/pom.xml
index b8524b90a7..b8524b90a7 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
index b70ddede4f..b70ddede4f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 958d1cf111..958d1cf111 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 9f1e8b63e5..9f1e8b63e5 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 5c8903fe5a..5c8903fe5a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 7dd7adda6b..7dd7adda6b 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
index 7edc392f46..7edc392f46 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
index 7edc392f46..7edc392f46 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 828dc6f472..828dc6f472 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index 9293b1ff52..9293b1ff52 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 03077aa4d4..03077aa4d4 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index c96deb4e1b..c96deb4e1b 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
index 9832da880e..9832da880e 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
index 5586179421..5586179421 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
index 404995a90f..404995a90f 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
index 0441e8c6f0..0441e8c6f0 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
index ac0ca72030..ac0ca72030 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
index 61f62fa16e..61f62fa16e 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
index dc4aa2c30e..dc4aa2c30e 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
index d149165366..d149165366 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
index 4a18aed5f3..4a18aed5f3 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/pom.xml
index 5ee3746bbb..5ee3746bbb 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
index 108481fcbd..108481fcbd 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
index 28fe368663..28fe368663 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
index be3b7365e5..be3b7365e5 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
index 03372349f8..03372349f8 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
index a2b3a7bc92..a2b3a7bc92 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index ea8d272a0c..ea8d272a0c 100644
--- a/java/sca-contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/java/sca-contrib/itest/osgi-contribution/pom.xml b/sca-java-2.x/contrib/itest/osgi-contribution/pom.xml
index 85656d9702..85656d9702 100644
--- a/java/sca-contrib/itest/osgi-contribution/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-contribution/pom.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/build-bundles.xml b/sca-java-2.x/contrib/itest/osgi-implementation/build-bundles.xml
index 53bf014546..53bf014546 100644
--- a/java/sca-contrib/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/build-bundles.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/pom.xml b/sca-java-2.x/contrib/itest/osgi-implementation/pom.xml
index 4fbc4258d0..4fbc4258d0 100644
--- a/java/sca-contrib/itest/osgi-implementation/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/pom.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index 37e750d7ec..37e750d7ec 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 9c145ff59f..9c145ff59f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index b1bb8c2aa0..b1bb8c2aa0 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 1c65ca573b..1c65ca573b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 958b0bf266..958b0bf266 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index 88fd845acd..88fd845acd 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index 21753cc33b..21753cc33b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index acef7fbf6a..acef7fbf6a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index 19b2fed53e..19b2fed53e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index ed1f12de44..ed1f12de44 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index e0f8c51262..e0f8c51262 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 9b8049164a..9b8049164a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index d6d6bcf4b1..d6d6bcf4b1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index 1966bc76a4..1966bc76a4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index 96b23e771c..96b23e771c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 9147c0ffa2..9147c0ffa2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index c55cb68d03..c55cb68d03 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 0940f9baf4..0940f9baf4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 50d8c26388..50d8c26388 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index a7bcb2ba06..a7bcb2ba06 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 9b3907c752..9b3907c752 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index f48c91d518..f48c91d518 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index e52565aedb..e52565aedb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 6548b409fb..6548b409fb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
index 1aabf4d10c..1aabf4d10c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 99a3d0087c..99a3d0087c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 305b3610d4..305b3610d4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index 4cd4fb36a5..4cd4fb36a5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index ecbad11fa0..ecbad11fa0 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 03040d81d1..03040d81d1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 8ef4a2d8d8..8ef4a2d8d8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index f3ea404997..f3ea404997 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index eda77b0c5d..eda77b0c5d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index b9adacca55..b9adacca55 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 3da2fb8e39..3da2fb8e39 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 90f709bf95..90f709bf95 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index d265f42c1b..d265f42c1b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9f636957ac..9f636957ac 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index e32028dd30..e32028dd30 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index cf8717fcf5..cf8717fcf5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 785212fa6d..785212fa6d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 510b3cdcce..510b3cdcce 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index a8270363d2..a8270363d2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index 6062757a32..6062757a32 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index 7d56770311..7d56770311 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 321bdc713f..321bdc713f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 6874a66db9..6874a66db9 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 47d290eb1a..47d290eb1a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index f4c102c4f0..f4c102c4f0 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 19b41cf4a4..19b41cf4a4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
index cb6345432f..cb6345432f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index d730273c0e..d730273c0e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
index d968d1ffc5..d968d1ffc5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index c81bf00d00..c81bf00d00 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 61c161617c..61c161617c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fd6a26a65f..fd6a26a65f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 0168bc2435..0168bc2435 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
index f6c04de980..f6c04de980 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
index 87918132e6..87918132e6 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
index 9b00787162..9b00787162 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
index af79dc4bdf..af79dc4bdf 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
index c1f11d0b6e..c1f11d0b6e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 39d90bb75c..39d90bb75c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/java/sca-contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 8399991503..8399991503 100644
--- a/java/sca-contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-2.x/contrib/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 189012d38b..189012d38b 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
index 2e3137239e..2e3137239e 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
index 0dafffdb8c..0dafffdb8c 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
index 6356718fe5..6356718fe5 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
index c9f77b71cf..c9f77b71cf 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
index 1fba0d6dcd..1fba0d6dcd 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
index 8bf7a1fb2f..8bf7a1fb2f 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
index ba9b7007b4..ba9b7007b4 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
index 85397195bd..85397195bd 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
index 9346fb8ed2..9346fb8ed2 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
index 501cded48d..501cded48d 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
index 687335b3c4..687335b3c4 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
index f605e024ba..f605e024ba 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
index 4f5640960b..4f5640960b 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
index 9a491304bf..9a491304bf 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
index 2e0b49e693..2e0b49e693 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
index eac9979f56..eac9979f56 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
index 62c0eef16d..62c0eef16d 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
index 155dd368a3..155dd368a3 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
index b45c062761..b45c062761 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
index c2dae9eb97..c2dae9eb97 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index 5966311f0e..5966311f0e 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 6a38f48c4a..6a38f48c4a 100644
--- a/java/sca-contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/java/sca-contrib/itest/osgi-tuscany/pom.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/pom.xml
index ad589503d6..ad589503d6 100644
--- a/java/sca-contrib/itest/osgi-tuscany/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/pom.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml
index c7ea66863f..c7ea66863f 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/pom.xml
index 4cbe7b4f85..4cbe7b4f85 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
index 0ac96b35a3..0ac96b35a3 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
index b7da27733d..b7da27733d 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 950606d044..950606d044 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 08e2f8df08..08e2f8df08 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
index 17b342f8dd..17b342f8dd 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 6bdec3615f..6bdec3615f 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
index cd204ebc2e..cd204ebc2e 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cbb55c969f..cbb55c969f 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
index b4807b80d1..b4807b80d1 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
index 645a94f6bf..645a94f6bf 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
index 4cbd41b627..4cbd41b627 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
index b524abc2a6..b524abc2a6 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
index 8549ca3409..8549ca3409 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
index 88d1e72efc..88d1e72efc 100644
--- a/java/sca-contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 84f8cc015b..84f8cc015b 100644
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
index 0c26477a43..0c26477a43 100644
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
diff --git a/java/sca-contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 5804f4711d..5804f4711d 100644
--- a/java/sca-contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/sca-java-2.x/contrib/itest/osgi-tuscany/tuscany-versioned/pom.xml
diff --git a/java/sca-contrib/itest/policy-security-basicauth/pom.xml b/sca-java-2.x/contrib/itest/policy-security-basicauth/pom.xml
index f3b3b28c1f..f3b3b28c1f 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/pom.xml
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
index a7e60e7e09..a7e60e7e09 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
index e9787bfac3..e9787bfac3 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml
index dbdf0cd263..dbdf0cd263 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite
index f883629180..f883629180 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index 10fbac4e20..10fbac4e20 100644
--- a/java/sca-contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/sca-java-2.x/contrib/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/java/sca-contrib/itest/policy-security-jsr250/pom.xml b/sca-java-2.x/contrib/itest/policy-security-jsr250/pom.xml
index 935958d8c2..935958d8c2 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/pom.xml
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
index 3569410e7d..3569410e7d 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
index bf4e1edaaa..bf4e1edaaa 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml
index 64b8a95d18..64b8a95d18 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite
index 456ca450f1..456ca450f1 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
index da5f6409ba..da5f6409ba 100644
--- a/java/sca-contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ b/sca-java-2.x/contrib/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/java/sca-contrib/itest/policy-security-token/pom.xml b/sca-java-2.x/contrib/itest/policy-security-token/pom.xml
index af7c2fe882..af7c2fe882 100644
--- a/java/sca-contrib/itest/policy-security-token/pom.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-token/pom.xml
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
index 2150cb63c6..2150cb63c6 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
index e9787bfac3..e9787bfac3 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/definitions.xml
index f7bb9bc374..f7bb9bc374 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/helloworld.composite
index 1db89fd502..1db89fd502 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/itest/policy-security-token/src/main/resources/jndi.properties b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/java/sca-contrib/itest/policy-security-token/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/sca-java-2.x/contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
index 167e45738f..167e45738f 100644
--- a/java/sca-contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
+++ b/sca-java-2.x/contrib/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
diff --git a/java/sca-contrib/itest/policy-security/pom.xml b/sca-java-2.x/contrib/itest/policy-security/pom.xml
index 23bced91b5..23bced91b5 100644
--- a/java/sca-contrib/itest/policy-security/pom.xml
+++ b/sca-java-2.x/contrib/itest/policy-security/pom.xml
diff --git a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/policy-security/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/policy-security/src/main/resources/definitions.xml
index c8118a0caf..c8118a0caf 100644
--- a/java/sca-contrib/itest/policy-security/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/policy-security/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/itest/policy-security/src/main/resources/helloworld.composite
index 9e0f289f87..9e0f289f87 100644
--- a/java/sca-contrib/itest/policy-security/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-2.x/contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
index 9dad17741e..9dad17741e 100644
--- a/java/sca-contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ b/sca-java-2.x/contrib/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/java/sca-contrib/itest/policy/pom.xml b/sca-java-2.x/contrib/itest/policy/pom.xml
index 67e956abca..67e956abca 100644
--- a/java/sca-contrib/itest/policy/pom.xml
+++ b/sca-java-2.x/contrib/itest/policy/pom.xml
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/AddService.java
index 198a38b657..198a38b657 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index e1726250de..e1726250de 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/DivideService.java
index 8f4c675370..8f4c675370 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 3dcadd724e..3dcadd724e 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3d314a9d14..3d314a9d14 100644
--- a/java/sca-contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-2.x/contrib/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/java/sca-contrib/itest/policy/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/itest/policy/src/main/resources/Calculator.composite
index aed7684099..aed7684099 100644
--- a/java/sca-contrib/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/policy/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/java/sca-contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/contrib/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca-contrib/itest/policy/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/policy/src/main/resources/definitions.xml
index 0009d712f3..0009d712f3 100644
--- a/java/sca-contrib/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/policy/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index 3aa6565c01..3aa6565c01 100644
--- a/java/sca-contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-2.x/contrib/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/pom.xml b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/pom.xml
index 485bf2fdfa..485bf2fdfa 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/pom.xml
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/pom.xml
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
index 5e80b7bdde..5e80b7bdde 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
index 1e887995dd..1e887995dd 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite
index cddf951d65..cddf951d65 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/example.composite
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
index a8ccde2e11..a8ccde2e11 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
index 2caec0f20d..2caec0f20d 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
diff --git a/java/sca-contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/java/sca-contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-2.x/contrib/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
diff --git a/java/sca-contrib/itest/recursive-ws/pom.xml b/sca-java-2.x/contrib/itest/recursive-ws/pom.xml
index 4ff655e6b1..4ff655e6b1 100644
--- a/java/sca-contrib/itest/recursive-ws/pom.xml
+++ b/sca-java-2.x/contrib/itest/recursive-ws/pom.xml
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/Target.java
index 2366f6542a..2366f6542a 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index b2d59e925c..b2d59e925c 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index 6f52dfb26e..6f52dfb26e 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/Composer.java
index 18486115ae..18486115ae 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 7956d153cb..7956d153cb 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3c432bc26a..3c432bc26a 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index 5035d1cbd9..5035d1cbd9 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Client.composite
index 56d7c01377..56d7c01377 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Inner.composite
index b054ae0944..b054ae0944 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Outer.composite
index 3c3f327b28..3c3f327b28 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index b5c180919c..b5c180919c 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 891cac0b79..891cac0b79 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 4b398743eb..4b398743eb 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index b50bc29a1f..b50bc29a1f 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 3ae202f4aa..3ae202f4aa 100644
--- a/java/sca-contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index c6e46564f0..c6e46564f0 100644
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 7ff34c9787..7ff34c9787 100644
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 6638d65551..6638d65551 100644
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 214379bcea..214379bcea 100644
--- a/java/sca-contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-2.x/contrib/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/java/sca-contrib/itest/recursive/pom.xml b/sca-java-2.x/contrib/itest/recursive/pom.xml
index 5bfd74f49d..5bfd74f49d 100644
--- a/java/sca-contrib/itest/recursive/pom.xml
+++ b/sca-java-2.x/contrib/itest/recursive/pom.xml
diff --git a/java/sca-contrib/itest/recursive/src/main/java/circular/include/DemoClass.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/circular/include/DemoClass.java
index fe42911486..fe42911486 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/circular/include/DemoClass.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/circular/include/DemoClass.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/Source.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/Source.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/SourceImpl.java
index 8e2b347604..8e2b347604 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/Target.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/Target.java
index 703e72fc10..703e72fc10 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/Target.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/TargetImpl.java
index cd9a9746fa..cd9a9746fa 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/A.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/A.java
index 65bf41920e..65bf41920e 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/A.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/A.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/B.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/B.java
index ecc04aff4c..ecc04aff4c 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/B.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/B.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/foo/I.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/I.java
index f6d55baef3..f6d55baef3 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/foo/I.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/foo/I.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/Target.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/Target.java
index 2366f6542a..2366f6542a 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/Target.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/Target.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java
index b2d59e925c..b2d59e925c 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/TargetClientImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java
index 6f52dfb26e..6f52dfb26e 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/policy/TargetServiceImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java
index 458a7d28a3..458a7d28a3 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java
index f3b9fc014d..f3b9fc014d 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java
index 445b622a72..445b622a72 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java
index e2de8f3dc5..e2de8f3dc5 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/sample/Service1.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/sample/Service1.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/AggregatorImpl.java
index 638219d431..638219d431 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java
index aae9aba587..aae9aba587 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java
index bd31498ccc..bd31498ccc 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test/Source.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/Source.java
index bcad89bf4d..bcad89bf4d 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test/Source.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java
index 831e3cbd7b..831e3cbd7b 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 8c32eca547..8c32eca547 100644
--- a/java/sca-contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/AComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/AComposite.composite
index 1b5dee8762..1b5dee8762 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/AComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/AComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/BComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/BComposite.composite
index 7d4588eba4..7d4588eba4 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/BComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/BComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/CComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/CComposite.composite
index 6d7b4ec600..6d7b4ec600 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/CComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/CComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite1.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite1.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite2.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite2.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Composite3.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Composite3.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Demo1Composite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Demo1Composite.composite
index 6b2a964b9b..6b2a964b9b 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Demo1Composite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Demo1Composite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Demo2Composite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Demo2Composite.composite
index 6b8c0a348e..6b8c0a348e 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Demo2Composite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Demo2Composite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Inner.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Inner.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 289b92a3f2..289b92a3f2 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/Outer.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/Outer.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/foo.png b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/foo.png
index 0f2ec78aaf..0f2ec78aaf 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/foo.png
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/foo.png
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o1.composite
index 1d31c2f424..1d31c2f424 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o1.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o2.composite
index 4f21c21860..4f21c21860 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o2.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o3.composite
index 72c732c03e..72c732c03e 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o3.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o4.composite
index f8f07eed09..f8f07eed09 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/foo/o4.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
index 4a6df023b8..4a6df023b8 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
index 25007aebb2..25007aebb2 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/policy/definitions.xml b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/definitions.xml
index 957028e3bd..957028e3bd 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/policy/definitions.xml
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-2.x/contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite
index d05a67f45f..d05a67f45f 100644
--- a/java/sca-contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-2.x/contrib/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/java/sca-contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
index 1f7c35dd91..1f7c35dd91 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 5482e47463..5482e47463 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index fb9872378d..fb9872378d 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 171f181438..171f181438 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/foo/O2TestCase.java
index d617ec8592..d617ec8592 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/foo/O2TestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/foo/O4TestCase.java
index 15626c75ac..15626c75ac 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/foo/O4TestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java
index c9cc84f7d4..c9cc84f7d4 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/policy/PolicyTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/C.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/C.java
index bf8391348b..bf8391348b 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/C.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/C.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/CImpl.java
index 98610e32a6..98610e32a6 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/CImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/NestedTestCase.java
index fc5d251460..fc5d251460 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/X.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/X.java
index e3a9335068..e3a9335068 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/X.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/X.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/XImpl.java
index 7f80dfccb2..7f80dfccb2 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/XImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/Y.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/Y.java
index c15a4f635a..c15a4f635a 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/Y.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/Y.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/YImpl.java
index b8e3a58974..b8e3a58974 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/sample/YImpl.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/test/OuterTestCase.java
index 6e95f5808b..6e95f5808b 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/java/sca-contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-2.x/contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index b3abcac06e..b3abcac06e 100644
--- a/java/sca-contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-2.x/contrib/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/java/sca-contrib/itest/serialization/pom.xml b/sca-java-2.x/contrib/itest/serialization/pom.xml
index 625bcf4154..625bcf4154 100644
--- a/java/sca-contrib/itest/serialization/pom.xml
+++ b/sca-java-2.x/contrib/itest/serialization/pom.xml
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
index 3c643436e9..3c643436e9 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
index 4d75c68c2d..4d75c68c2d 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
index b129cbc4b7..b129cbc4b7 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
index c268f9bda7..c268f9bda7 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
index 64c5e7e631..64c5e7e631 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
index b233241514..b233241514 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
index 9e55eea7ee..9e55eea7ee 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
index 804debf30c..804debf30c 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
index ffe3a3b8ef..ffe3a3b8ef 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
index 795f2d9c46..795f2d9c46 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
diff --git a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
index bb8d40e788..bb8d40e788 100644
--- a/java/sca-contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
diff --git a/java/sca-contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-2.x/contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
index 28c32d6fa4..28c32d6fa4 100644
--- a/java/sca-contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
diff --git a/java/sca-contrib/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-2.x/contrib/itest/serialization/src/main/resources/nestedcomposite.composite
index 8e1a132b0a..8e1a132b0a 100644
--- a/java/sca-contrib/itest/serialization/src/main/resources/nestedcomposite.composite
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/resources/nestedcomposite.composite
diff --git a/java/sca-contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-2.x/contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
index 76e77284fb..76e77284fb 100644
--- a/java/sca-contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ b/sca-java-2.x/contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
diff --git a/java/sca-contrib/itest/spring/pom.xml b/sca-java-2.x/contrib/itest/spring/pom.xml
index ce5e060d46..ce5e060d46 100644
--- a/java/sca-contrib/itest/spring/pom.xml
+++ b/sca-java-2.x/contrib/itest/spring/pom.xml
diff --git a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 833cc50f71..833cc50f71 100644
--- a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d6db2bd182..d6db2bd182 100644
--- a/java/sca-contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/java/sca-contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
index dea3790494..dea3790494 100644
--- a/java/sca-contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/java/sca-contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 000b135f01..000b135f01 100644
--- a/java/sca-contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/CalculatorService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 18ab7e332d..18ab7e332d 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
index 3faed92fd2..3faed92fd2 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
index 74473073ea..74473073ea 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
index fb4be314b6..fb4be314b6 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/access/Calculator.composite
index 03116905fc..03116905fc 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/context/access/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/access/Calculator.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
index 709de34a34..709de34a34 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/imports/Calculator.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
index 3838515055..3838515055 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/context/multiple/StockQuote.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
index 0551dc60ef..0551dc60ef 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/Calculator.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
index 992c1b92f5..992c1b92f5 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 70b2d5fdab..70b2d5fdab 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index bab9ecb528..bab9ecb528 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
index a8a1f5b703..a8a1f5b703 100644
--- a/java/sca-contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/access/CalculatorClient.java
index 9b7202d951..9b7202d951 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/access/CalculatorClient.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
index 5feb293bc8..5feb293bc8 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java
index d3bd190cc0..d3bd190cc0 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
index 3940bf65fa..3940bf65fa 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..75b296bf32 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
index ca64d5fcb9..ca64d5fcb9 100644
--- a/java/sca-contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
index 27e634d301..27e634d301 100644
--- a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index 1e759f98a0..1e759f98a0 100644
--- a/java/sca-contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..634e3d34af 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index aeb7918add..aeb7918add 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 5869d344f6..5869d344f6 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index 90d26dd89f..90d26dd89f 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..4088691ccd 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index 840bf59b73..840bf59b73 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/java/sca-contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
index c21561a962..c21561a962 100644
--- a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 3a9ec4bbb2..3a9ec4bbb2 100644
--- a/java/sca-contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/contrib/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/java/sca-contrib/itest/transaction/pom.xml b/sca-java-2.x/contrib/itest/transaction/pom.xml
index efdd2bf5a4..efdd2bf5a4 100644
--- a/java/sca-contrib/itest/transaction/pom.xml
+++ b/sca-java-2.x/contrib/itest/transaction/pom.xml
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
index d7d18181d9..d7d18181d9 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
index ac986dd417..ac986dd417 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
index a6ea036da7..a6ea036da7 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
index 776d23407a..776d23407a 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
index 4d504a6a36..4d504a6a36 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
index 6010d9abad..6010d9abad 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
index b7ea5f2663..b7ea5f2663 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
index 45a9a26c3d..45a9a26c3d 100644
--- a/java/sca-contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/accounts.composite b/sca-java-2.x/contrib/itest/transaction/src/main/resources/accounts.composite
index f4c6b650c7..f4c6b650c7 100644
--- a/java/sca-contrib/itest/transaction/src/main/resources/accounts.composite
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/resources/accounts.composite
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/definitions.xml b/sca-java-2.x/contrib/itest/transaction/src/main/resources/definitions.xml
index 8aa6ba313a..8aa6ba313a 100644
--- a/java/sca-contrib/itest/transaction/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/itest/transaction/src/main/resources/log4j.properties b/sca-java-2.x/contrib/itest/transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/java/sca-contrib/itest/transaction/src/main/resources/log4j.properties
+++ b/sca-java-2.x/contrib/itest/transaction/src/main/resources/log4j.properties
diff --git a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-2.x/contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
index c23628ff91..c23628ff91 100644
--- a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-2.x/contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
index 36884f6098..36884f6098 100644
--- a/java/sca-contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ b/sca-java-2.x/contrib/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/java/sca-contrib/itest/validation/pom.xml b/sca-java-2.x/contrib/itest/validation/pom.xml
index 36026471ac..36026471ac 100644
--- a/java/sca-contrib/itest/validation/pom.xml
+++ b/sca-java-2.x/contrib/itest/validation/pom.xml
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java
index ece64ae4b0..ece64ae4b0 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 1a859b04d2..1a859b04d2 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 81d7d2e585..81d7d2e585 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/java/sca-contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddService.java
index 4df26ffd7b..4df26ffd7b 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index 32080df91b..32080df91b 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index 201726c451..201726c451 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 3f93b8e8a5..3f93b8e8a5 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 599c3f7bb4..599c3f7bb4 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index 823408908f..823408908f 100644
--- a/java/sca-contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index bdde8a4721..bdde8a4721 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 138f1a4565..138f1a4565 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java
index 0cdd72942e..0cdd72942e 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 97d13c8190..97d13c8190 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/java/sca-contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-2.x/contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index 038e2c720f..038e2c720f 100644
--- a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-2.x/contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index 4b67ebae97..4b67ebae97 100644
--- a/java/sca-contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 609ffed02d..609ffed02d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index 59017f0c09..59017f0c09 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
index 218dbc47c4..218dbc47c4 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
index 5975c27663..5975c27663 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
index 145aea9fbc..145aea9fbc 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
index c52da84a0c..c52da84a0c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index b74682e1bd..b74682e1bd 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
index f439ab6260..f439ab6260 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index 6e5fcf1286..6e5fcf1286 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
index d3ce4d91c1..d3ce4d91c1 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
index c1ff61f07c..c1ff61f07c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
index 077df56290..077df56290 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
index 94ee650207..94ee650207 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 8346dcc01a..8346dcc01a 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/java/sca-contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-2.x/contrib/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 55999fe27d..55999fe27d 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index 5ab65b2f64..5ab65b2f64 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 52803411cf..52803411cf 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index 8adf1aa2aa..8adf1aa2aa 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 2790cd0a6c..2790cd0a6c 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index c6daaebfe5..c6daaebfe5 100644
--- a/java/sca-contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index 204034737b..204034737b 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index ff2e413ab7..ff2e413ab7 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index 1632f95689..1632f95689 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 054f5a6035..054f5a6035 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index f3f61ec04b..f3f61ec04b 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index 76d8a63b51..76d8a63b51 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 95c108e6db..95c108e6db 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 2f66bbfe0c..2f66bbfe0c 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index decf234753..decf234753 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index 445a41700b..445a41700b 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index 531573a0aa..531573a0aa 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index 758e19d264..758e19d264 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 96319438b6..96319438b6 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index a2a4caa0b0..a2a4caa0b0 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index 0d91afd7e6..0d91afd7e6 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 048fcc7d43..048fcc7d43 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index 856c9f3b27..856c9f3b27 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index b584cb8d94..b584cb8d94 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index ae26008564..ae26008564 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index fedc1f7530..fedc1f7530 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index d94643cbc9..d94643cbc9 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index 4cbe3def2d..4cbe3def2d 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 2fe8af318c..2fe8af318c 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 09865ab855..09865ab855 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 3be31d5994..3be31d5994 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index 303b8299ad..303b8299ad 100644
--- a/java/sca-contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index f4ba8eb4e6..f4ba8eb4e6 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index a7b23ed10f..a7b23ed10f 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 96d8debd4a..96d8debd4a 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 7246d6e0a3..7246d6e0a3 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 3ffd10f36f..3ffd10f36f 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 0e0e4cd2bd..0e0e4cd2bd 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 45c7af3d1f..45c7af3d1f 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index ef2d13aaaa..ef2d13aaaa 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 9014fb00e5..9014fb00e5 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index 69382b0456..69382b0456 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 057039b4df..057039b4df 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index cda4f9cb57..cda4f9cb57 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index e8475bb865..e8475bb865 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 88721a18e2..88721a18e2 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 1a0739eaa5..1a0739eaa5 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index c20c551d92..c20c551d92 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index 7ae97638ce..7ae97638ce 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 6e5eb41ba0..6e5eb41ba0 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 2eec73f815..2eec73f815 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index ab2c373486..ab2c373486 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index 9b5adee7e6..9b5adee7e6 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index 1b8116a469..1b8116a469 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index c848cbb243..c848cbb243 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index a13ea84260..a13ea84260 100644
--- a/java/sca-contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 60b0c51fef..60b0c51fef 100644
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index dd38802bbe..dd38802bbe 100644
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index d83a4bfed9..d83a4bfed9 100644
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index b64de39c80..b64de39c80 100644
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
index 0a71ea06c7..0a71ea06c7 100644
--- a/java/sca-contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-2.x/contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index 6fd5c04671..6fd5c04671 100644
--- a/java/sca-contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 690fb97a31..690fb97a31 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index a768535fde..a768535fde 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 64d41bdb48..64d41bdb48 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index 585bd62027..585bd62027 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index aab3529fba..aab3529fba 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 4c3226f4c8..4c3226f4c8 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b9c0b68f7e..b9c0b68f7e 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index fc32e96b52..fc32e96b52 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
index 4b367f85ef..4b367f85ef 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 969690acaf..969690acaf 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index eef964e274..eef964e274 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index c2fd7b3410..c2fd7b3410 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index c6a58d2b88..c6a58d2b88 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index ff0b2f3589..ff0b2f3589 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index 7b445960f1..7b445960f1 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 6b4521cdc9..6b4521cdc9 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index f46e9e4035..f46e9e4035 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index ed95bcdcf0..ed95bcdcf0 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index bd5a6d9601..bd5a6d9601 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 390eeb7e95..390eeb7e95 100644
--- a/java/sca-contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index e2bee4d2ac..e2bee4d2ac 100644
--- a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index 3b567da717..3b567da717 100644
--- a/java/sca-contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index fc03bc25eb..fc03bc25eb 100644
--- a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index d41d72585f..d41d72585f 100644
--- a/java/sca-contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 2d4bb3d499..2d4bb3d499 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index 5b5bfe7b37..5b5bfe7b37 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 8ef3cacc4e..8ef3cacc4e 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index 38d59196dd..38d59196dd 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index 9671f9c983..9671f9c983 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index c2ede5cd41..c2ede5cd41 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index 08c27ee011..08c27ee011 100644
--- a/java/sca-contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/sca-java-2.x/contrib/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/pom.xml b/sca-java-2.x/contrib/itest/ws-void-args-return/pom.xml
index 5b5f00aac1..5b5f00aac1 100644
--- a/java/sca-contrib/itest/ws-void-args-return/pom.xml
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/pom.xml
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
index 43e251369d..43e251369d 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
index dfb7f0a474..dfb7f0a474 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
index 9bb945b71a..9bb945b71a 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
index d549bccaf0..d549bccaf0 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
index 9ea0a98f95..9ea0a98f95 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite
index 0f31c4cd2c..0f31c4cd2c 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/java/sca-contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-2.x/contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
index eaaa67c22c..eaaa67c22c 100644
--- a/java/sca-contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ b/sca-java-2.x/contrib/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/pom.xml b/sca-java-2.x/contrib/itest/wsdl-multiple/pom.xml
index b8f499a754..b8f499a754 100644
--- a/java/sca-contrib/itest/wsdl-multiple/pom.xml
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/pom.xml
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
index c5b297cf61..c5b297cf61 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
index 1d03f42830..1d03f42830 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
index fc0e2d6122..fc0e2d6122 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
index 7f8285fa09..7f8285fa09 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
index 9d9ed57cc7..9d9ed57cc7 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
index 0c1dc5d353..0c1dc5d353 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
index ea2f93c3e6..ea2f93c3e6 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
index 1e50e146f2..1e50e146f2 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
index 6a872faa17..6a872faa17 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
index 5852f8d802..5852f8d802 100644
--- a/java/sca-contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdl/pom.xml b/sca-java-2.x/contrib/itest/wsdl/pom.xml
index 871653ca18..871653ca18 100644
--- a/java/sca-contrib/itest/wsdl/pom.xml
+++ b/sca-java-2.x/contrib/itest/wsdl/pom.xml
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index f3a5873d53..f3a5873d53 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f74817a0ff..f74817a0ff 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index 47204b66ed..47204b66ed 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index 7e18f52518..7e18f52518 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 231aa0f9f3..231aa0f9f3 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 254fa34af3..254fa34af3 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index c0e39baa82..c0e39baa82 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 5723aed35d..5723aed35d 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index 6f26a02c3e..6f26a02c3e 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 77ba127636..77ba127636 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index c2a2420181..c2a2420181 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index 4eb1ba333d..4eb1ba333d 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index dbaf1ac0a5..dbaf1ac0a5 100644
--- a/java/sca-contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/java/sca-contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/java/sca-contrib/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd
index 108b1f393f..108b1f393f 100644
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/Hello.xsd
diff --git a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 1966acc957..1966acc957 100644
--- a/java/sca-contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/java/sca-contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdl2java/pom.xml b/sca-java-2.x/contrib/itest/wsdl2java/pom.xml
index ff8ae3f8e2..ff8ae3f8e2 100644
--- a/java/sca-contrib/itest/wsdl2java/pom.xml
+++ b/sca-java-2.x/contrib/itest/wsdl2java/pom.xml
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl
index 50d580f299..50d580f299 100644
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/EchoService.xsd
index 8069d4861f..8069d4861f 100644
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/java/sca-contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/java/sca-contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/java/sca-contrib/itest/wsdlless/pom.xml b/sca-java-2.x/contrib/itest/wsdlless/pom.xml
index 7630651bc6..7630651bc6 100644
--- a/java/sca-contrib/itest/wsdlless/pom.xml
+++ b/sca-java-2.x/contrib/itest/wsdlless/pom.xml
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index e2c884ec74..e2c884ec74 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index c23a281b6f..c23a281b6f 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index 591e9d04d3..591e9d04d3 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index 196dd2a5ba..196dd2a5ba 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 00b70807a9..00b70807a9 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f74be92d8a..f74be92d8a 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 1acfea21a3..1acfea21a3 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index 78882aa1d0..78882aa1d0 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index 6892c99e13..6892c99e13 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index 062275833e..062275833e 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 74e2ae5d0d..74e2ae5d0d 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 84bacd658d..84bacd658d 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index eed10cde7c..eed10cde7c 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 3a79f52575..3a79f52575 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/AnObject.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/AnObject.java
index 65ba52f356..65ba52f356 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/AnObject.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/AnObject.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java
index 69eba6701d..69eba6701d 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/MoreComplexObject.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeService.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/SomeService.java
index 2283f8095f..2283f8095f 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/SomeService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
index 728799c131..728799c131 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/some.composite b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/some.composite
index 1b099239d1..1b099239d1 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/some.composite
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/some.composite
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index bc6fe0e89a..bc6fe0e89a 100644
--- a/java/sca-contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 33f541b21b..33f541b21b 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index 82bf7ce650..82bf7ce650 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
index 7c62287c57..7c62287c57 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java
index effeb3c701..effeb3c701 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/AnObject.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
index 284e961788..284e961788 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
index 4113aa1a0a..4113aa1a0a 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
index 532b948b47..532b948b47 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
index 82bfb2d2aa..82bfb2d2aa 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
index 61c7c6cb19..61c7c6cb19 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
index 1ba0c497d9..1ba0c497d9 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java
index 4a584a8da2..4a584a8da2 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/SomeService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
index 44c2b67256..44c2b67256 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
diff --git a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/package-info.java b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/package-info.java
index d7b3fef82e..d7b3fef82e 100644
--- a/java/sca-contrib/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ b/sca-java-2.x/contrib/itest/wsdlless/src/test/java/service/generated/package-info.java