6264 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/LICENSE b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/LICENSE
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/LICENSE
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/NOTICE b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/NOTICE
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/NOTICE
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/README b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/README
index 3ec27ef65f..3ec27ef65f 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/README
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/README
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.png b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/alert-aggregator.png
index ae429cca94..ae429cca94 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.png
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/alert-aggregator.png
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.svg b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/alert-aggregator.svg
index 807416135e..807416135e 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/alert-aggregator.svg
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/alert-aggregator.svg
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/build-dojo.xml
index c31c9adee8..c31c9adee8 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/build-dojo.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/build-dojo.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/build.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/build.xml
index b75842d08c..b75842d08c 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/build.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/build.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/pom.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/pom.xml
index 71139b0863..71139b0863 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/pom.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/pom.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
index 808374030c..808374030c 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
index cf2f906388..cf2f906388 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
index 8797349640..8797349640 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
index 569d9b7f6f..569d9b7f6f 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
index f61c307120..f61c307120 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
index 38e7ba31a6..38e7ba31a6 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
index 2962defb25..2962defb25 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
index 75544294ce..75544294ce 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
index 2a5775e9a9..2a5775e9a9 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
index 549abbf602..549abbf602 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
index 10575bf0dc..10575bf0dc 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
index 8b376240c8..8b376240c8 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
index f0ec561ad8..f0ec561ad8 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
index d5642a32d1..d5642a32d1 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
index 49f44f9da8..49f44f9da8 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
index c359b275be..c359b275be 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml
index e45250eddb..e45250eddb 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/resources/sources.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
index 8b472fd0fa..8b472fd0fa 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 0bc67c4c98..0bc67c4c98 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index bd31898e3b..bd31898e3b 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index a81165e1b4..a81165e1b4 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png
index 1cf1df24a7..1cf1df24a7 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/pop.png
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png
index b3c949d224..b3c949d224 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/rss.png
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd
index 3c6b6c9b12..3c6b6c9b12 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/service.smd
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
index b5f1824363..b5f1824363 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css
index f5bbf23379..f5bbf23379 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/main/webapp/style.css
diff --git a/java/sca-contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
index f0cb9ecfcb..f0cb9ecfcb 100644
--- a/java/sca-contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
+++ b/sca-java-2.x/contrib/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
diff --git a/java/sca-contrib/demos/bigbank-account/LICENSE b/sca-java-2.x/contrib/demos/bigbank-account/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/bigbank-account/LICENSE
+++ b/sca-java-2.x/contrib/demos/bigbank-account/LICENSE
diff --git a/java/sca-contrib/demos/bigbank-account/NOTICE b/sca-java-2.x/contrib/demos/bigbank-account/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/bigbank-account/NOTICE
+++ b/sca-java-2.x/contrib/demos/bigbank-account/NOTICE
diff --git a/java/sca-contrib/demos/bigbank-account/README b/sca-java-2.x/contrib/demos/bigbank-account/README
index 5c0d850c5e..5c0d850c5e 100644
--- a/java/sca-contrib/demos/bigbank-account/README
+++ b/sca-java-2.x/contrib/demos/bigbank-account/README
diff --git a/java/sca-contrib/demos/bigbank-account/bigbank.png b/sca-java-2.x/contrib/demos/bigbank-account/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/java/sca-contrib/demos/bigbank-account/bigbank.png
+++ b/sca-java-2.x/contrib/demos/bigbank-account/bigbank.png
diff --git a/java/sca-contrib/demos/bigbank-account/bigbank.svg b/sca-java-2.x/contrib/demos/bigbank-account/bigbank.svg
index 0650075d48..0650075d48 100644
--- a/java/sca-contrib/demos/bigbank-account/bigbank.svg
+++ b/sca-java-2.x/contrib/demos/bigbank-account/bigbank.svg
diff --git a/java/sca-contrib/demos/bigbank-account/build-dojo.xml b/sca-java-2.x/contrib/demos/bigbank-account/build-dojo.xml
index 0e029c6335..0e029c6335 100644
--- a/java/sca-contrib/demos/bigbank-account/build-dojo.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-account/build-dojo.xml
diff --git a/java/sca-contrib/demos/bigbank-account/build.xml b/sca-java-2.x/contrib/demos/bigbank-account/build.xml
index f7ebe32968..f7ebe32968 100644
--- a/java/sca-contrib/demos/bigbank-account/build.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-account/build.xml
diff --git a/java/sca-contrib/demos/bigbank-account/pom.xml b/sca-java-2.x/contrib/demos/bigbank-account/pom.xml
index 12421e3788..12421e3788 100644
--- a/java/sca-contrib/demos/bigbank-account/pom.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-account/pom.xml
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 57c1adcba0..57c1adcba0 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
index c984700efc..c984700efc 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index d79cf373ee..d79cf373ee 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index cc9023da60..cc9023da60 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 4a28b3f90b..4a28b3f90b 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index d93007279c..d93007279c 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index 579b4ee64b..579b4ee64b 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 5c64e11d10..5c64e11d10 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index c98dcacbf3..c98dcacbf3 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index 121ee9a3f8..121ee9a3f8 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index 1d565f7ca1..1d565f7ca1 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 5fecef691e..5fecef691e 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index 6667a4ba53..6667a4ba53 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index da1b6e1d06..da1b6e1d06 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 1473436000..1473436000 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
index da2e7940ca..da2e7940ca 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index c3474a554f..c3474a554f 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
index cc76e30a75..cc76e30a75 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
index c5532b879d..c5532b879d 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite
index 696b96d6e6..696b96d6e6 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/SavingsAccount.composite
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/StockAccount.composite b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/StockAccount.composite
index 62c0b63003..62c0b63003 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/StockAccount.composite
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/StockAccount.composite
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/definitions.xml b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/definitions.xml
index 31a8798f8b..31a8798f8b 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html
index 1609bf4b43..1609bf4b43 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/web/AccountJSON.html
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/web/style.css
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/web/style.css
diff --git a/java/sca-contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/java/sca-contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/contrib/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/java/sca-contrib/demos/bigbank-calculator/LICENSE b/sca-java-2.x/contrib/demos/bigbank-calculator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/bigbank-calculator/LICENSE
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/LICENSE
diff --git a/java/sca-contrib/demos/bigbank-calculator/NOTICE b/sca-java-2.x/contrib/demos/bigbank-calculator/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/bigbank-calculator/NOTICE
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/NOTICE
diff --git a/java/sca-contrib/demos/bigbank-calculator/README b/sca-java-2.x/contrib/demos/bigbank-calculator/README
index e8ff28fc0f..e8ff28fc0f 100644
--- a/java/sca-contrib/demos/bigbank-calculator/README
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/README
diff --git a/java/sca-contrib/demos/bigbank-calculator/build.xml b/sca-java-2.x/contrib/demos/bigbank-calculator/build.xml
index a06f0806df..a06f0806df 100644
--- a/java/sca-contrib/demos/bigbank-calculator/build.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/build.xml
diff --git a/java/sca-contrib/demos/bigbank-calculator/pom.xml b/sca-java-2.x/contrib/demos/bigbank-calculator/pom.xml
index 982fdb7e2a..982fdb7e2a 100644
--- a/java/sca-contrib/demos/bigbank-calculator/pom.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/pom.xml
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 0b42a6ab1f..0b42a6ab1f 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
index b1861daafc..b1861daafc 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite
index 851813d31f..851813d31f 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index dd56af0ad8..dd56af0ad8 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 08fa310f46..08fa310f46 100644
--- a/java/sca-contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/contrib/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/java/sca-contrib/demos/bigbank-stockquote/LICENSE b/sca-java-2.x/contrib/demos/bigbank-stockquote/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/LICENSE
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/LICENSE
diff --git a/java/sca-contrib/demos/bigbank-stockquote/NOTICE b/sca-java-2.x/contrib/demos/bigbank-stockquote/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/NOTICE
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/NOTICE
diff --git a/java/sca-contrib/demos/bigbank-stockquote/README b/sca-java-2.x/contrib/demos/bigbank-stockquote/README
index 2ea98d020c..2ea98d020c 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/README
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/README
diff --git a/java/sca-contrib/demos/bigbank-stockquote/build.xml b/sca-java-2.x/contrib/demos/bigbank-stockquote/build.xml
index 145c158ac2..145c158ac2 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/build.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/build.xml
diff --git a/java/sca-contrib/demos/bigbank-stockquote/pom.xml b/sca-java-2.x/contrib/demos/bigbank-stockquote/pom.xml
index 97586917cc..97586917cc 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/pom.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/pom.xml
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
index 2d7821171d..2d7821171d 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
index 63c31bd116..63c31bd116 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
index a20f4e46dd..a20f4e46dd 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
index 04ed762602..04ed762602 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
index aaad92c861..aaad92c861 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml
index 7e1f51304e..7e1f51304e 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/security.properties b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/security.properties
index a5b889c269..a5b889c269 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/security.properties
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/security.properties
diff --git a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
index d53d32c4ef..d53d32c4ef 100644
--- a/java/sca-contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
+++ b/sca-java-2.x/contrib/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
diff --git a/java/sca-contrib/demos/bigbank/LICENSE b/sca-java-2.x/contrib/demos/bigbank/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/bigbank/LICENSE
+++ b/sca-java-2.x/contrib/demos/bigbank/LICENSE
diff --git a/java/sca-contrib/demos/bigbank/NOTICE b/sca-java-2.x/contrib/demos/bigbank/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/bigbank/NOTICE
+++ b/sca-java-2.x/contrib/demos/bigbank/NOTICE
diff --git a/java/sca-contrib/demos/bigbank/README b/sca-java-2.x/contrib/demos/bigbank/README
index 5ec796db60..5ec796db60 100644
--- a/java/sca-contrib/demos/bigbank/README
+++ b/sca-java-2.x/contrib/demos/bigbank/README
diff --git a/java/sca-contrib/demos/bigbank/bigbank.png b/sca-java-2.x/contrib/demos/bigbank/bigbank.png
index 985cc6bd05..985cc6bd05 100644
--- a/java/sca-contrib/demos/bigbank/bigbank.png
+++ b/sca-java-2.x/contrib/demos/bigbank/bigbank.png
diff --git a/java/sca-contrib/demos/bigbank/bigbank.svg b/sca-java-2.x/contrib/demos/bigbank/bigbank.svg
index 30aa0eab6d..30aa0eab6d 100644
--- a/java/sca-contrib/demos/bigbank/bigbank.svg
+++ b/sca-java-2.x/contrib/demos/bigbank/bigbank.svg
diff --git a/java/sca-contrib/demos/bigbank/build-dojo.xml b/sca-java-2.x/contrib/demos/bigbank/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/java/sca-contrib/demos/bigbank/build-dojo.xml
+++ b/sca-java-2.x/contrib/demos/bigbank/build-dojo.xml
diff --git a/java/sca-contrib/demos/bigbank/build.xml b/sca-java-2.x/contrib/demos/bigbank/build.xml
index 046aadd228..046aadd228 100644
--- a/java/sca-contrib/demos/bigbank/build.xml
+++ b/sca-java-2.x/contrib/demos/bigbank/build.xml
diff --git a/java/sca-contrib/demos/bigbank/pom.xml b/sca-java-2.x/contrib/demos/bigbank/pom.xml
index d9946b0a09..d9946b0a09 100644
--- a/java/sca-contrib/demos/bigbank/pom.xml
+++ b/sca-java-2.x/contrib/demos/bigbank/pom.xml
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java
index 951cd175d3..951cd175d3 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 4cff2b7966..4cff2b7966 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index b8aff2a3b1..b8aff2a3b1 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
index a7fa5ecc22..a7fa5ecc22 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
index 05360e07a5..05360e07a5 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
index 6d3b547939..6d3b547939 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
index 5d3366ae00..5d3366ae00 100644
--- a/java/sca-contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/BigBank.composite
index 11591308b4..11591308b4 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/BigBank.composite
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
index 154992c843..154992c843 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/bigbank.jks b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/bigbank.jks
index e6294d85f7..e6294d85f7 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/bigbank.jks
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/bigbank.jks
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/definitions.xml b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/definitions.xml
index 8654151d82..8654151d82 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/security.properties b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/security.properties
index d1b489acbb..d1b489acbb 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/security.properties
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/security.properties
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/web/AccountJSON.html b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/web/AccountJSON.html
index 9f4368443f..9f4368443f 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/web/AccountJSON.html
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/web/AccountJSON.html
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/web/style.css b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/web/style.css
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/web/style.css
diff --git a/java/sca-contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
index ac4d987a57..ac4d987a57 100644
--- a/java/sca-contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-2.x/contrib/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
diff --git a/java/sca-contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java b/sca-java-2.x/contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java
index 3b7c5ef2ad..3b7c5ef2ad 100644
--- a/java/sca-contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java
+++ b/sca-java-2.x/contrib/demos/bigbank/src/test/java/test/BigBankTestCase.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/LICENSE b/sca-java-2.x/contrib/demos/load-balancing-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/LICENSE
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/LICENSE
diff --git a/java/sca-contrib/demos/load-balancing-webapp/NOTICE b/sca-java-2.x/contrib/demos/load-balancing-webapp/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/NOTICE
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/NOTICE
diff --git a/java/sca-contrib/demos/load-balancing-webapp/README b/sca-java-2.x/contrib/demos/load-balancing-webapp/README
index b7bbb64b1a..b7bbb64b1a 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/README
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/README
diff --git a/java/sca-contrib/demos/load-balancing-webapp/build-tomcat.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/build-tomcat.xml
index 7e1dc4b0e9..7e1dc4b0e9 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/build-tomcat.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/build-tomcat.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/build.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/build.xml
index b84f85616e..b84f85616e 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/build.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/build.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/pom.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/pom.xml
index cdd6727460..cdd6727460 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/pom.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/pom.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
index 872893945e..872893945e 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
index 33c37869a3..33c37869a3 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 23beb7f933..23beb7f933 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
index 513c2e3129..513c2e3129 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
index f3d2fdb2ed..f3d2fdb2ed 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
index 5dc1b6671b..5dc1b6671b 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
index 9b6052741e..9b6052741e 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 11347004f9..11347004f9 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 1ab78d802d..1ab78d802d 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
index 8d47ae2207..8d47ae2207 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
index 37cf284d35..37cf284d35 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
index 9228c4fd8e..9228c4fd8e 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
index 920fa7b037..920fa7b037 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
index 7486dc8148..7486dc8148 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
index 5ecb8fe5c4..5ecb8fe5c4 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
diff --git a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
index f83c68191c..f83c68191c 100644
--- a/java/sca-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
+++ b/sca-java-2.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/LICENSE b/sca-java-2.x/contrib/demos/mortgage-creditcheck/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/LICENSE
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/LICENSE
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/NOTICE b/sca-java-2.x/contrib/demos/mortgage-creditcheck/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/NOTICE
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/NOTICE
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/README b/sca-java-2.x/contrib/demos/mortgage-creditcheck/README
index b785802920..b785802920 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/README
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/README
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/build.xml b/sca-java-2.x/contrib/demos/mortgage-creditcheck/build.xml
index 59f1342276..59f1342276 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/build.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/build.xml
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/pom.xml b/sca-java-2.x/contrib/demos/mortgage-creditcheck/pom.xml
index a5e268812b..a5e268812b 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/pom.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/pom.xml
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
index 26048de722..26048de722 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
index 20a0c5dd7f..20a0c5dd7f 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
index 870ea1941d..870ea1941d 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
index 5c828f5a39..5c828f5a39 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
index aea009292a..aea009292a 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
index d7b2e32dd1..d7b2e32dd1 100644
--- a/java/sca-contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/LICENSE b/sca-java-2.x/contrib/demos/mortgage-loanapproval/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/LICENSE
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/LICENSE
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/NOTICE b/sca-java-2.x/contrib/demos/mortgage-loanapproval/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/NOTICE
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/NOTICE
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/README b/sca-java-2.x/contrib/demos/mortgage-loanapproval/README
index dbf3829a20..dbf3829a20 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/README
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/README
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/build.xml b/sca-java-2.x/contrib/demos/mortgage-loanapproval/build.xml
index 9a0a83bf1d..9a0a83bf1d 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/build.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/build.xml
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg
index e28ed63cfb..e28ed63cfb 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/credit_composite.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/credit_composite.png
index 0bfce0078d..0bfce0078d 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/credit_composite.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/credit_composite.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg
index 3f00557c7f..3f00557c7f 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/loan_approval.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/loan_approval.png
index 9d5f829fe5..9d5f829fe5 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/loan_approval.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/loan_approval.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
index 515b6ecde7..515b6ecde7 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
index 4b815a4b82..4b815a4b82 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
index 01a7c55a14..01a7c55a14 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
index 07422c4f45..07422c4f45 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
index 992c048684..992c048684 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
index 4667956ed0..4667956ed0 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
index 5021f6a317..5021f6a317 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png
index 1398c50ded..1398c50ded 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_composite.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
index 32a0b72907..32a0b72907 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
index e91c5f1bbd..e91c5f1bbd 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png
index db304a4c28..db304a4c28 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package1.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
index e8c2865e4a..e8c2865e4a 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png
index 502e538e94..502e538e94 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_package2.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
index fccf2e35c3..fccf2e35c3 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png
index b8f42ad318..b8f42ad318 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/doc/mortgage_scenario.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/mortgage_assembly.png b/sca-java-2.x/contrib/demos/mortgage-loanapproval/mortgage_assembly.png
index 4667956ed0..4667956ed0 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/mortgage_assembly.png
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/mortgage_assembly.png
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/pom.xml b/sca-java-2.x/contrib/demos/mortgage-loanapproval/pom.xml
index 2947a59ee9..2947a59ee9 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/pom.xml
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/pom.xml
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
index 2d830fdf7a..2d830fdf7a 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
index 8f85bc7d9c..8f85bc7d9c 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
index 66a486d516..66a486d516 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
index b5bafeb204..b5bafeb204 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
index e5d7a1f077..e5d7a1f077 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
index dcdad18496..dcdad18496 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
index f211e1356c..f211e1356c 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
index 350b2c24ea..350b2c24ea 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
index 839e9e098c..839e9e098c 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
index d69f0a1163..d69f0a1163 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
index 23c9589e85..23c9589e85 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
index 0e88093c61..0e88093c61 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
index d1128b9907..d1128b9907 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
index 4cad6c7223..4cad6c7223 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
index bf7b10e0f7..bf7b10e0f7 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
index b25af1d039..b25af1d039 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
index 9c2acc96d3..9c2acc96d3 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
diff --git a/java/sca-contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
index 285cc72515..285cc72515 100644
--- a/java/sca-contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
+++ b/sca-java-2.x/contrib/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
diff --git a/java/sca-contrib/demos/pom.xml b/sca-java-2.x/contrib/demos/pom.xml
index 9ada7dba1e..9ada7dba1e 100644
--- a/java/sca-contrib/demos/pom.xml
+++ b/sca-java-2.x/contrib/demos/pom.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/LICENSE b/sca-java-2.x/contrib/demos/workpool-distributed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/demos/workpool-distributed/LICENSE
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/LICENSE
diff --git a/java/sca-contrib/demos/workpool-distributed/NOTICE b/sca-java-2.x/contrib/demos/workpool-distributed/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/demos/workpool-distributed/NOTICE
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/NOTICE
diff --git a/java/sca-contrib/demos/workpool-distributed/build.xml b/sca-java-2.x/contrib/demos/workpool-distributed/build.xml
index 9e10e8ec91..9e10e8ec91 100644
--- a/java/sca-contrib/demos/workpool-distributed/build.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/build.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/pom.xml b/sca-java-2.x/contrib/demos/workpool-distributed/pom.xml
index 6d441bdfaf..6d441bdfaf 100644
--- a/java/sca-contrib/demos/workpool-distributed/pom.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/pom.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
index a278499aae..a278499aae 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
index 9d05761ad6..9d05761ad6 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
index f48e647bd6..f48e647bd6 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
index 1f2a4d1f9a..1f2a4d1f9a 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
index 86557548af..86557548af 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
index 9c5a5d1b7f..9c5a5d1b7f 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
index cdd0f30b34..cdd0f30b34 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
index 3d4df38c95..3d4df38c95 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
index fb930adf2e..fb930adf2e 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
index e04411668b..e04411668b 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
index 52703d6954..52703d6954 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
index d2b306cbd5..d2b306cbd5 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
index 9660a6c2b2..9660a6c2b2 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
index 3f702db369..3f702db369 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
index 22cfc38ff4..22cfc38ff4 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
index c38b27a6cf..c38b27a6cf 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
index 80c093ff1c..80c093ff1c 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
index 0ecc223fed..0ecc223fed 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
index 0bdc3671d5..0bdc3671d5 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
index 46fbda7998..46fbda7998 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
index cf353fb3fe..cf353fb3fe 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
index 239e5d145d..239e5d145d 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
index 268edae530..268edae530 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
index 9a00a8e839..9a00a8e839 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
index a71dc9e08a..a71dc9e08a 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
index 771db5370b..771db5370b 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
index 55fd48934f..55fd48934f 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
index 1dc9ccfcea..1dc9ccfcea 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
diff --git a/java/sca-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java b/sca-java-2.x/contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
index 5c20537fab..5c20537fab 100644
--- a/java/sca-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules.drl b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules.drl
index e7ebcad4c0..e7ebcad4c0 100644
--- a/java/sca-contrib/demos/workpool-distributed/workerRules.drl
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules.drl
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules1.drl b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules1.drl
index 6fa0b85ba2..6fa0b85ba2 100644
--- a/java/sca-contrib/demos/workpool-distributed/workerRules1.drl
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules1.drl
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules2.drl b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules2.drl
index 9d9551c3ea..9d9551c3ea 100644
--- a/java/sca-contrib/demos/workpool-distributed/workerRules2.drl
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules2.drl
diff --git a/java/sca-contrib/demos/workpool-distributed/workerRules3.drl b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules3.drl
index a67af910a4..a67af910a4 100644
--- a/java/sca-contrib/demos/workpool-distributed/workerRules3.drl
+++ b/sca-java-2.x/contrib/demos/workpool-distributed/workerRules3.drl
diff --git a/java/sca-contrib/demos/xml-bigbank/LICENSE b/sca-java-2.x/contrib/demos/xml-bigbank/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/demos/xml-bigbank/LICENSE
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/LICENSE
diff --git a/java/sca-contrib/demos/xml-bigbank/NOTICE b/sca-java-2.x/contrib/demos/xml-bigbank/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/demos/xml-bigbank/NOTICE
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/NOTICE
diff --git a/java/sca-contrib/demos/xml-bigbank/README b/sca-java-2.x/contrib/demos/xml-bigbank/README
index 3bdeeca60a..3bdeeca60a 100644
--- a/java/sca-contrib/demos/xml-bigbank/README
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/README
diff --git a/java/sca-contrib/demos/xml-bigbank/build.xml b/sca-java-2.x/contrib/demos/xml-bigbank/build.xml
index 0ba1b069aa..0ba1b069aa 100644
--- a/java/sca-contrib/demos/xml-bigbank/build.xml
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/build.xml
diff --git a/java/sca-contrib/demos/xml-bigbank/pom.xml b/sca-java-2.x/contrib/demos/xml-bigbank/pom.xml
index 0dc535352b..0dc535352b 100644
--- a/java/sca-contrib/demos/xml-bigbank/pom.xml
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/pom.xml
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
index c3ae8d0912..c3ae8d0912 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
index bb37b97fb8..bb37b97fb8 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
index 4c72384e7b..4c72384e7b 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
index 77af28d6cd..77af28d6cd 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
index a7703787fb..a7703787fb 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
index f5f1ca90b6..f5f1ca90b6 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
index 96f9e9bd18..96f9e9bd18 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
index 358e5e19a2..358e5e19a2 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
index 3b95f5240f..3b95f5240f 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
index 7896cf7890..7896cf7890 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
index 6b9ab1f9a3..6b9ab1f9a3 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/BigBank.composite
index 8afde4bf80..8afde4bf80 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/BigBank.composite
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/accounts.xml b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/accounts.xml
index 52ffd41fa7..52ffd41fa7 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/accounts.xml
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/accounts.xml
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/customer.xsd b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/customer.xsd
index b22efb74c4..b22efb74c4 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/customer.xsd
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/customer.xsd
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/stock.xq b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/stock.xq
index 03c19e457d..03c19e457d 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/stock.xq
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/stock.xq
diff --git a/java/sca-contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
index 8411e22ff7..8411e22ff7 100644
--- a/java/sca-contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
diff --git a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.png b/sca-java-2.x/contrib/demos/xml-bigbank/xml-bigbank.png
index 0743a413a3..0743a413a3 100644
--- a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.png
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/xml-bigbank.png
diff --git a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.svg b/sca-java-2.x/contrib/demos/xml-bigbank/xml-bigbank.svg
index c7acc03324..c7acc03324 100644
--- a/java/sca-contrib/demos/xml-bigbank/xml-bigbank.svg
+++ b/sca-java-2.x/contrib/demos/xml-bigbank/xml-bigbank.svg
diff --git a/java/sca-contrib/distribution/core/pom.xml b/sca-java-2.x/contrib/distribution/core/pom.xml
index 8da15ac32d..8da15ac32d 100644
--- a/java/sca-contrib/distribution/core/pom.xml
+++ b/sca-java-2.x/contrib/distribution/core/pom.xml
diff --git a/java/sca-contrib/distribution/core/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/core/src/main/assembly/bin.xml
index 8a882e6623..8a882e6623 100644
--- a/java/sca-contrib/distribution/core/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/core/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/core/src/main/assembly/src.xml
index 7fc8a97b96..7fc8a97b96 100644
--- a/java/sca-contrib/distribution/core/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-common.xml b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/java/sca-contrib/distribution/core/src/main/components/bin-common.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-common.xml
diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-modules.xml b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-modules.xml
index 69ec47740a..69ec47740a 100644
--- a/java/sca-contrib/distribution/core/src/main/components/bin-modules.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-modules.xml
diff --git a/java/sca-contrib/distribution/core/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-samples.xml
index 64533c6ee2..64533c6ee2 100644
--- a/java/sca-contrib/distribution/core/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/core/src/main/components/src-common.xml b/sca-java-2.x/contrib/distribution/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/java/sca-contrib/distribution/core/src/main/components/src-common.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/components/src-common.xml
diff --git a/java/sca-contrib/distribution/core/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/core/src/main/components/src-modules.xml
index edf73ec8fc..edf73ec8fc 100644
--- a/java/sca-contrib/distribution/core/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/core/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/core/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/core/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/core/src/main/release/README b/sca-java-2.x/contrib/distribution/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/core/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/README
diff --git a/java/sca-contrib/distribution/core/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/core/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/core/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/core/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/core/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/core/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/core/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/core/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/core/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/core/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/core/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/core/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/ejava/pom.xml b/sca-java-2.x/contrib/distribution/ejava/pom.xml
index f02a29093e..f02a29093e 100644
--- a/java/sca-contrib/distribution/ejava/pom.xml
+++ b/sca-java-2.x/contrib/distribution/ejava/pom.xml
diff --git a/java/sca-contrib/distribution/ejava/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/ejava/src/main/assembly/bin.xml
index 3a85bc09a3..3a85bc09a3 100644
--- a/java/sca-contrib/distribution/ejava/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/ejava/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/ejava/src/main/assembly/src.xml
index ce301181e0..ce301181e0 100644
--- a/java/sca-contrib/distribution/ejava/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/ejava/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/ejava/src/main/components/bin-samples.xml
index 02e58456c6..02e58456c6 100644
--- a/java/sca-contrib/distribution/ejava/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/ejava/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/ejava/src/main/components/src-modules.xml
index 4da310abab..4da310abab 100644
--- a/java/sca-contrib/distribution/ejava/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/ejava/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/README b/sca-java-2.x/contrib/distribution/ejava/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/README
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/ejava/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/ejava/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/ejava/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/ejava/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/etc/generate-all-maven-files.sh b/sca-java-2.x/contrib/distribution/etc/generate-all-maven-files.sh
index 4d1327f518..4d1327f518 100755
--- a/java/sca-contrib/distribution/etc/generate-all-maven-files.sh
+++ b/sca-java-2.x/contrib/distribution/etc/generate-all-maven-files.sh
diff --git a/java/sca-contrib/distribution/etc/generate-filtered-dependencies.sh b/sca-java-2.x/contrib/distribution/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/java/sca-contrib/distribution/etc/generate-filtered-dependencies.sh
+++ b/sca-java-2.x/contrib/distribution/etc/generate-filtered-dependencies.sh
diff --git a/java/sca-contrib/distribution/etc/generate-maven-files.sh b/sca-java-2.x/contrib/distribution/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/java/sca-contrib/distribution/etc/generate-maven-files.sh
+++ b/sca-java-2.x/contrib/distribution/etc/generate-maven-files.sh
diff --git a/java/sca-contrib/distribution/etc/generate-pom.sh b/sca-java-2.x/contrib/distribution/etc/generate-pom.sh
index b8446a51d3..b8446a51d3 100755
--- a/java/sca-contrib/distribution/etc/generate-pom.sh
+++ b/sca-java-2.x/contrib/distribution/etc/generate-pom.sh
diff --git a/java/sca-contrib/distribution/etc/generate-src-modules.sh b/sca-java-2.x/contrib/distribution/etc/generate-src-modules.sh
index 9a1272258c..9a1272258c 100755
--- a/java/sca-contrib/distribution/etc/generate-src-modules.sh
+++ b/sca-java-2.x/contrib/distribution/etc/generate-src-modules.sh
diff --git a/java/sca-contrib/distribution/manager/pom.xml b/sca-java-2.x/contrib/distribution/manager/pom.xml
index bb4aec34e3..bb4aec34e3 100644
--- a/java/sca-contrib/distribution/manager/pom.xml
+++ b/sca-java-2.x/contrib/distribution/manager/pom.xml
diff --git a/java/sca-contrib/distribution/manager/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/manager/src/main/assembly/bin.xml
index fdcc421f2f..fdcc421f2f 100644
--- a/java/sca-contrib/distribution/manager/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/manager/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/manager/src/main/assembly/src.xml
index af3cb8e6fc..af3cb8e6fc 100644
--- a/java/sca-contrib/distribution/manager/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/manager/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/manager/src/main/components/bin-samples.xml
index d4b13c42e0..d4b13c42e0 100644
--- a/java/sca-contrib/distribution/manager/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/manager/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/manager/src/main/components/src-modules.xml
index 3437db9cc5..3437db9cc5 100644
--- a/java/sca-contrib/distribution/manager/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/manager/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/manager/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/manager/src/main/release/README b/sca-java-2.x/contrib/distribution/manager/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/README
diff --git a/java/sca-contrib/distribution/manager/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/manager/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/manager/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/manager/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/manager/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/manager/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/process/pom.xml b/sca-java-2.x/contrib/distribution/process/pom.xml
index f32271bf09..f32271bf09 100644
--- a/java/sca-contrib/distribution/process/pom.xml
+++ b/sca-java-2.x/contrib/distribution/process/pom.xml
diff --git a/java/sca-contrib/distribution/process/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/process/src/main/assembly/bin.xml
index fdcc421f2f..fdcc421f2f 100644
--- a/java/sca-contrib/distribution/process/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/process/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/process/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/process/src/main/assembly/src.xml
index af3cb8e6fc..af3cb8e6fc 100644
--- a/java/sca-contrib/distribution/process/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/process/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/process/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/process/src/main/components/bin-samples.xml
index 8e8bc2e507..8e8bc2e507 100644
--- a/java/sca-contrib/distribution/process/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/process/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/process/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/process/src/main/components/src-modules.xml
index 68b2c39644..68b2c39644 100644
--- a/java/sca-contrib/distribution/process/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/process/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/process/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/process/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/process/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/process/src/main/release/README b/sca-java-2.x/contrib/distribution/process/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/process/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/README
diff --git a/java/sca-contrib/distribution/process/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/process/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/process/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/process/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/process/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/process/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/process/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/process/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/process/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/process/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/process/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/process/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/process/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/process/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/process/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/repository/pom.xml b/sca-java-2.x/contrib/distribution/repository/pom.xml
index 7da3dffadf..7da3dffadf 100644
--- a/java/sca-contrib/distribution/repository/pom.xml
+++ b/sca-java-2.x/contrib/distribution/repository/pom.xml
diff --git a/java/sca-contrib/distribution/repository/src/main/assembly/repository.xml b/sca-java-2.x/contrib/distribution/repository/src/main/assembly/repository.xml
index 03d8732bd6..03d8732bd6 100644
--- a/java/sca-contrib/distribution/repository/src/main/assembly/repository.xml
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/assembly/repository.xml
diff --git a/java/sca-contrib/distribution/repository/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/repository/src/main/components/src-modules.xml
index 0736faf913..0736faf913 100644
--- a/java/sca-contrib/distribution/repository/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/repository/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/repository/src/main/release/README b/sca-java-2.x/contrib/distribution/repository/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/README
diff --git a/java/sca-contrib/distribution/repository/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/repository/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/repository/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/repository/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/repository/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/repository/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/web20/pom.xml b/sca-java-2.x/contrib/distribution/web20/pom.xml
index c9d6adb1f9..c9d6adb1f9 100644
--- a/java/sca-contrib/distribution/web20/pom.xml
+++ b/sca-java-2.x/contrib/distribution/web20/pom.xml
diff --git a/java/sca-contrib/distribution/web20/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/web20/src/main/assembly/bin.xml
index fdcc421f2f..fdcc421f2f 100644
--- a/java/sca-contrib/distribution/web20/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/web20/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/web20/src/main/assembly/src.xml
index af3cb8e6fc..af3cb8e6fc 100644
--- a/java/sca-contrib/distribution/web20/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/web20/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/web20/src/main/components/bin-samples.xml
index 5cc62040c0..5cc62040c0 100644
--- a/java/sca-contrib/distribution/web20/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/web20/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/web20/src/main/components/src-modules.xml
index 68aae46796..68aae46796 100644
--- a/java/sca-contrib/distribution/web20/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/web20/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/web20/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/web20/src/main/release/README b/sca-java-2.x/contrib/distribution/web20/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/README
diff --git a/java/sca-contrib/distribution/web20/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/web20/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/web20/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/web20/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/web20/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/web20/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/webapp/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/webapp/src/main/assembly/bin.xml
index fdcc421f2f..fdcc421f2f 100644
--- a/java/sca-contrib/distribution/webapp/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/webapp/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/webapp/src/main/assembly/src.xml
index af3cb8e6fc..af3cb8e6fc 100644
--- a/java/sca-contrib/distribution/webapp/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/webapp/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/webapp/src/main/components/bin-samples.xml
index a9b53dea4f..a9b53dea4f 100644
--- a/java/sca-contrib/distribution/webapp/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/webapp/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/webapp/src/main/components/src-modules.xml
index cb46e33258..cb46e33258 100644
--- a/java/sca-contrib/distribution/webapp/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/webapp/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/README b/sca-java-2.x/contrib/distribution/webapp/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/README
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/webapp/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/webapp/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-contrib/distribution/webapp/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/webapp/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/distribution/webservice/pom.xml b/sca-java-2.x/contrib/distribution/webservice/pom.xml
index 628cc8ab67..628cc8ab67 100644
--- a/java/sca-contrib/distribution/webservice/pom.xml
+++ b/sca-java-2.x/contrib/distribution/webservice/pom.xml
diff --git a/java/sca-contrib/distribution/webservice/src/main/assembly/bin.xml b/sca-java-2.x/contrib/distribution/webservice/src/main/assembly/bin.xml
index fdcc421f2f..fdcc421f2f 100644
--- a/java/sca-contrib/distribution/webservice/src/main/assembly/bin.xml
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/assembly/bin.xml
diff --git a/java/sca-contrib/distribution/webservice/src/main/assembly/src.xml b/sca-java-2.x/contrib/distribution/webservice/src/main/assembly/src.xml
index af3cb8e6fc..af3cb8e6fc 100644
--- a/java/sca-contrib/distribution/webservice/src/main/assembly/src.xml
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/assembly/src.xml
diff --git a/java/sca-contrib/distribution/webservice/src/main/components/bin-samples.xml b/sca-java-2.x/contrib/distribution/webservice/src/main/components/bin-samples.xml
index e2ced4a343..e2ced4a343 100644
--- a/java/sca-contrib/distribution/webservice/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/components/bin-samples.xml
diff --git a/java/sca-contrib/distribution/webservice/src/main/components/src-modules.xml b/sca-java-2.x/contrib/distribution/webservice/src/main/components/src-modules.xml
index deea9b713c..deea9b713c 100644
--- a/java/sca-contrib/distribution/webservice/src/main/components/src-modules.xml
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/components/src-modules.xml
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/CHANGES b/sca-java-2.x/contrib/distribution/webservice/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/CHANGES
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/CHANGES
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/README b/sca-java-2.x/contrib/distribution/webservice/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/README
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/README
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/RELEASE_NOTES b/sca-java-2.x/contrib/distribution/webservice/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/RELEASE_NOTES
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/RELEASE_NOTES
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/INSTALL b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/INSTALL
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/LICENSE b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/LICENSE
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/bin/NOTICE b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/NOTICE
index 5daa9a3dfe..5daa9a3dfe 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/bin/NOTICE
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/BUILDING b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/BUILDING
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/BUILDING
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/LICENSE b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/LICENSE
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/LICENSE
diff --git a/java/sca-contrib/distribution/webservice/src/main/release/src/NOTICE b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/NOTICE
index 31540fd607..31540fd607 100644
--- a/java/sca-contrib/distribution/webservice/src/main/release/src/NOTICE
+++ b/sca-java-2.x/contrib/distribution/webservice/src/main/release/src/NOTICE
diff --git a/java/sca-contrib/features/compact/pom.xml b/sca-java-2.x/contrib/features/compact/pom.xml
index 0899195d06..0899195d06 100644
--- a/java/sca-contrib/features/compact/pom.xml
+++ b/sca-java-2.x/contrib/features/compact/pom.xml
diff --git a/java/sca-contrib/features/manager/pom.xml b/sca-java-2.x/contrib/features/manager/pom.xml
index 6c593f8a31..6c593f8a31 100644
--- a/java/sca-contrib/features/manager/pom.xml
+++ b/sca-java-2.x/contrib/features/manager/pom.xml
diff --git a/java/sca-contrib/features/process/pom.xml b/sca-java-2.x/contrib/features/process/pom.xml
index 17faf5ec41..17faf5ec41 100644
--- a/java/sca-contrib/features/process/pom.xml
+++ b/sca-java-2.x/contrib/features/process/pom.xml
diff --git a/java/sca-contrib/features/repository/pom.xml b/sca-java-2.x/contrib/features/repository/pom.xml
index c6bb2a5d3b..c6bb2a5d3b 100644
--- a/java/sca-contrib/features/repository/pom.xml
+++ b/sca-java-2.x/contrib/features/repository/pom.xml
diff --git a/java/sca-contrib/features/web20/pom.xml b/sca-java-2.x/contrib/features/web20/pom.xml
index ffd3d01888..ffd3d01888 100644
--- a/java/sca-contrib/features/web20/pom.xml
+++ b/sca-java-2.x/contrib/features/web20/pom.xml
diff --git a/java/sca-contrib/features/webapp/pom.xml b/sca-java-2.x/contrib/features/webapp/pom.xml
index 1e2af4b9ec..1e2af4b9ec 100644
--- a/java/sca-contrib/features/webapp/pom.xml
+++ b/sca-java-2.x/contrib/features/webapp/pom.xml
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
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/LICENSE b/sca-java-2.x/contrib/modules/assembly-xml-osoa/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/LICENSE
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/LICENSE
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF
index 209391fa4d..209391fa4d 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/NOTICE b/sca-java-2.x/contrib/modules/assembly-xml-osoa/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/NOTICE
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/NOTICE
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/pom.xml b/sca-java-2.x/contrib/modules/assembly-xml-osoa/pom.xml
index 1cb0907928..1cb0907928 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/pom.xml
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/pom.xml
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java
index 4bb4d84316..4bb4d84316 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/BaseAssemblyProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java
index 643f5ab78d..643f5ab78d 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ComponentTypeProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java
index bfdd9fdac7..bfdd9fdac7 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/CompositeProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java
index 797d0bb47a..797d0bb47a 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/Constants.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java
index 125ee2970e..125ee2970e 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/ConstrainingTypeProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java
index adb8655447..adb8655447 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/osoa/PolicySubjectProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e778ab7e3c..e778ab7e3c 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index a363691a51..a363691a51 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 05c965f40e..05c965f40e 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties
index 8cc5e5a5ec..8cc5e5a5ec 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java
index 938cc7750d..938cc7750d 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/BuildPolicyTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java
index 5d9b8e4556..5d9b8e4556 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/MultiplicityReadWriteTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java
index 4d981b8c4d..4d981b8c4d 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadAllTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java
index 94036c50cb..94036c50cb 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadDocumentTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java
index 98b8c81533..98b8c81533 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java
index b86907579e..b86907579e 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyAttributeTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java
index d15bce9544..d15bce9544 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteAnyElementTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java
index 77a199acc9..77a199acc9 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ReadWriteLocalCompositeTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java
index c242ce33fd..c242ce33fd 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolvePolicyTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java
index 628cc6acd6..628cc6acd6 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/ResolveTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java
index 173b987693..173b987693 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestAttributeProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java
index 911b8b3ffd..911b8b3ffd 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestPolicyProcessor.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java
index 7d923d5483..7d923d5483 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java
index 5645a6b1c9..5645a6b1c9 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/TestSCABindingImpl.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java
index ffc1ce9aa0..ffc1ce9aa0 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WireTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java
index c7d18f94ec..c7d18f94ec 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteAllTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java
index 66ddf3b003..66ddf3b003 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/java/org/apache/tuscany/sca/assembly/xml/osoa/WriteNamespacesTestCase.java
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite
index 614489d2d5..614489d2d5 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Calculator.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType
index d6ec9b0ff0..d6ec9b0ff0 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorComponent.constrainingType
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType
index 299eb8c197..299eb8c197 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/CalculatorImpl.componentType
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite
index 308ad8754b..308ad8754b 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/JavaScriptReference.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite
index 369cbc00bf..369cbc00bf 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/Multiplicity.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite
index 6f71f0a7f1..6f71f0a7f1 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/NestedCalculator.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite
index 2a0bcf0f76..2a0bcf0f76 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/RMIBindingTest.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite
index c52c8f79a9..c52c8f79a9 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllCalculator.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllDivide.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite
index d0f66676e0..d0f66676e0 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/TestAllPolicyCalculator.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml
index be694f289f..be694f289f 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/another_test_definitions.xml
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite
index abeab18a92..abeab18a92 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/local.composite
diff --git a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml
index 4616d07262..4616d07262 100644
--- a/java/sca-contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml
+++ b/sca-java-2.x/contrib/modules/assembly-xml-osoa/src/test/resources/org/apache/tuscany/sca/assembly/xml/osoa/test_definitions.xml
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/LICENSE b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/LICENSE
index 646cd58e09..646cd58e09 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/LICENSE
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/LICENSE
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF
index 309ce0b003..309ce0b003 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/NOTICE b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/NOTICE
index 91c3b75575..91c3b75575 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/NOTICE
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/NOTICE
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/pom.xml b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/pom.xml
index 88c55f9bdd..88c55f9bdd 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/pom.xml
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/pom.xml
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 69b2701e30..69b2701e30 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd
index 68455a3474..68455a3474 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-all.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-ejb.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-sca.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd
index 2dd44f8e06..2dd44f8e06 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-binding-webservice.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd
index caf5d8010f..caf5d8010f 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-contributions.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd
index f03d0eab01..f03d0eab01 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-core.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-definitions.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-bpel.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-composite.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-java.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd
index 83e6bb75bf..83e6bb75bf 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-jee.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd
index a1adf10fd9..a1adf10fd9 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-implementation-web.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-java.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-interface-wsdl.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd
index 2c4875f36c..2c4875f36c 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca-policy.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd
index a177816cdd..a177816cdd 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/sca.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd
index 788571de7b..788571de7b 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd
index bd36a8f52f..bd36a8f52f 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index bacfdda781..bacfdda781 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd
index 4557cda947..4557cda947 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/tuscany-sca.xsd
diff --git a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd
index 79af5e9363..79af5e9363 100644
--- a/java/sca-contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd
+++ b/sca-java-2.x/contrib/modules/assembly-xsd-osoa/src/main/resources/wsdli.xsd
diff --git a/java/sca-contrib/modules/binding-atom-abdera/LICENSE b/sca-java-2.x/contrib/modules/binding-atom-abdera/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/LICENSE
diff --git a/java/sca-contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF
index 85b23310e3..85b23310e3 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-atom-abdera/NOTICE b/sca-java-2.x/contrib/modules/binding-atom-abdera/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/NOTICE
diff --git a/java/sca-contrib/modules/binding-atom-abdera/ReceiptToms.gif b/sca-java-2.x/contrib/modules/binding-atom-abdera/ReceiptToms.gif
index bfeee9b2f4..bfeee9b2f4 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/ReceiptToms.gif
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/ReceiptToms.gif
diff --git a/java/sca-contrib/modules/binding-atom-abdera/ReceiptValue.jpg b/sca-java-2.x/contrib/modules/binding-atom-abdera/ReceiptValue.jpg
index 584f39ea8d..584f39ea8d 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/ReceiptValue.jpg
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/ReceiptValue.jpg
diff --git a/java/sca-contrib/modules/binding-atom-abdera/pom.xml b/sca-java-2.x/contrib/modules/binding-atom-abdera/pom.xml
index b5ccbe90e8..b5ccbe90e8 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/pom.xml
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 81ec1ddad3..81ec1ddad3 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index 455eef81cd..455eef81cd 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index 84232aa3af..84232aa3af 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index f6c713fae7..f6c713fae7 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index 2651324ccf..2651324ccf 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index 62fde86122..62fde86122 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index f2b1d1f72b..f2b1d1f72b 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index e1d470f5a3..e1d470f5a3 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
index 4e586a5510..4e586a5510 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
index eaa2bc4a97..eaa2bc4a97 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
index ffe8a03f20..ffe8a03f20 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
index 08c1ed7ac9..08c1ed7ac9 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
index 6beed6881f..6beed6881f 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index 5b4d995dc1..5b4d995dc1 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 383344f3cb..383344f3cb 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index 7ec9c1480e..7ec9c1480e 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index bc32b91367..bc32b91367 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 0aefce608b..0aefce608b 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index 222dc3e394..222dc3e394 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
index 41257d9a7f..41257d9a7f 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
index 0aabf225a4..0aabf225a4 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index a881f2dd0a..a881f2dd0a 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
index 703419f527..703419f527 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
index 4915f7426e..4915f7426e 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
index 96ea508210..96ea508210 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index a2c50f872e..a2c50f872e 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 60097ee0f7..60097ee0f7 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 71aa932a12..71aa932a12 100644
--- a/java/sca-contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-2.x/contrib/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
diff --git a/java/sca-contrib/modules/binding-atom/LICENSE b/sca-java-2.x/contrib/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-atom/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-atom/LICENSE
diff --git a/java/sca-contrib/modules/binding-atom/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-atom/META-INF/MANIFEST.MF
index ff7fe96475..ff7fe96475 100644
--- a/java/sca-contrib/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-atom/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-atom/NOTICE b/sca-java-2.x/contrib/modules/binding-atom/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-atom/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-atom/NOTICE
diff --git a/java/sca-contrib/modules/binding-atom/pom.xml b/sca-java-2.x/contrib/modules/binding-atom/pom.xml
index e5a7462228..e5a7462228 100644
--- a/java/sca-contrib/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-atom/pom.xml
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 807d6a8971..807d6a8971 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index 1c68ab5bc1..1c68ab5bc1 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 52e0e916f5..52e0e916f5 100644
--- a/java/sca-contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 1477554cd1..1477554cd1 100644
--- a/java/sca-contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-corba-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF
index 45b1f17ec6..45b1f17ec6 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-corba-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-corba-runtime/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-corba-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-corba-runtime/pom.xml
index 77b1a02b55..77b1a02b55 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
index aa1669045b..aa1669045b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
index 0ad3b2240e..0ad3b2240e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
index e177e1912f..e177e1912f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
index a574c52703..a574c52703 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
index b3569e43b9..b3569e43b9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
index a554f56035..a554f56035 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
index 823db1e748..823db1e748 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
index feb6627e25..feb6627e25 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
index 1e7a0087e0..1e7a0087e0 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
index e7d0b8b91b..e7d0b8b91b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
index 6a01c70a38..6a01c70a38 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
index 2828e09cc7..2828e09cc7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
index c5c98ab27c..c5c98ab27c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
index b88c097008..b88c097008 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
index d8524eaee9..d8524eaee9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
index 57e2fae9f4..57e2fae9f4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
index 2e2066802a..2e2066802a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
index 766048ac64..766048ac64 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
index ab7371bbe8..ab7371bbe8 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
index 706a44406b..706a44406b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
index d4207ab735..d4207ab735 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
index 1ba4002303..1ba4002303 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
index 009eac3377..009eac3377 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
index 34bee2a0e4..34bee2a0e4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
index 35a1e539d9..35a1e539d9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
index bbc2012a38..bbc2012a38 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
index 761cc5d62c..761cc5d62c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
index b2d2afd011..b2d2afd011 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
index f667123bb7..f667123bb7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
index 5661232e1e..5661232e1e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
index 7c39725012..7c39725012 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
index e903b59e50..e903b59e50 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
index 79d3c0cbc8..79d3c0cbc8 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
index c89a25401d..c89a25401d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
index 911c787b11..911c787b11 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
index f4cdabc8e2..f4cdabc8e2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
index 5a4fcba221..5a4fcba221 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
index 1fc729b926..1fc729b926 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
index 0f1f973f49..0f1f973f49 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
index ded82bf12e..ded82bf12e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
index df2e833fcd..df2e833fcd 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
index 7ccd70f69e..7ccd70f69e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
index f9facac0cc..f9facac0cc 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
index 414e50abf4..414e50abf4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 9855dec8af..9855dec8af 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index 38891340f9..38891340f9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 1b1754f347..1b1754f347 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index f0dccd9e7e..f0dccd9e7e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index 6975c62ddb..6975c62ddb 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 4767728db7..4767728db7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 962a00d002..962a00d002 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
index f4ca1577f5..f4ca1577f5 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
index d10bc498b7..d10bc498b7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
index 98987c1252..98987c1252 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
index d80adb476a..d80adb476a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
index 9f520f3c5d..9f520f3c5d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
index 11c22f1d72..11c22f1d72 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
index ca9233c77f..ca9233c77f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
index 1a1a36fd16..1a1a36fd16 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
index 7cef0ea189..7cef0ea189 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
index 5498104905..5498104905 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
index 72beff0537..72beff0537 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
index 747337597c..747337597c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
index 2b239deadc..2b239deadc 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
index 6427d9d200..6427d9d200 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
index 94683e0327..94683e0327 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
index e4cac28e4f..e4cac28e4f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
index 38e29c0d63..38e29c0d63 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
index e3c28f8b91..e3c28f8b91 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
index 775cac8e16..775cac8e16 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
index 32cd9c8df6..32cd9c8df6 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
index 3f73557952..3f73557952 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
index a6160a7643..a6160a7643 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
index 6afa6bc806..6afa6bc806 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
index bab0c27f77..bab0c27f77 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
index 514627ff4b..514627ff4b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
index 4629ca9cff..4629ca9cff 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
index aa480f93ac..aa480f93ac 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
index 5ed36ca19b..5ed36ca19b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
index ec1cfadd1e..ec1cfadd1e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
index 29865ace06..29865ace06 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
index d7839ec4db..d7839ec4db 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
index c47d63208f..c47d63208f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
index f767e8c11a..f767e8c11a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
index e7cbb4b8ca..e7cbb4b8ca 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
index 5d27f9969c..5d27f9969c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
index ab01c66675..ab01c66675 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
index f4ea58e55e..f4ea58e55e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
index 82609a36c1..82609a36c1 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
index 1389bd33d9..1389bd33d9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
index a73e252129..a73e252129 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
index 65ce051129..65ce051129 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index fde204edf8..fde204edf8 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 71b4fbbdb6..71b4fbbdb6 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index d758a560a9..d758a560a9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 464c2ccbc3..464c2ccbc3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index c053f12a02..c053f12a02 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index 566689960e..566689960e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index 6564957081..6564957081 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index 26669de95a..26669de95a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index 5a140f5ecc..5a140f5ecc 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 2a8fe73417..2a8fe73417 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 63e3926dd2..63e3926dd2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index a8231236eb..a8231236eb 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index ca86420240..ca86420240 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index 2a8898d38f..2a8898d38f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index bed30e00ca..bed30e00ca 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 73dbd6c198..73dbd6c198 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 8f524ffeb1..8f524ffeb1 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index 3231a136dc..3231a136dc 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 28d3ecdc91..28d3ecdc91 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 29ff2edfd2..29ff2edfd2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index b8aea13c8d..b8aea13c8d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 0bacb6746a..0bacb6746a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index c6e8c2a4e0..c6e8c2a4e0 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 079cc6e899..079cc6e899 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index b444ce68d8..b444ce68d8 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index 0b08e1fb67..0b08e1fb67 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index a87534f88b..a87534f88b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index e219dfa338..e219dfa338 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index c0bc0d6ebd..c0bc0d6ebd 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index ad47595ddf..ad47595ddf 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index f3d96e8fd7..f3d96e8fd7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index cb0ab8bcfd..cb0ab8bcfd 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index 0bde1e701c..0bde1e701c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 19b2942cfe..19b2942cfe 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index 8bb5a9c69d..8bb5a9c69d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index dc89e71092..dc89e71092 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 7b71aa0a9f..7b71aa0a9f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 513bab37cc..513bab37cc 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index c1d06e2ba9..c1d06e2ba9 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index f9ad7b77ac..f9ad7b77ac 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index cfb292fc01..cfb292fc01 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 02f46a7d85..02f46a7d85 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 505aa3f026..505aa3f026 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 5cbaa109ee..5cbaa109ee 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 2f792888fb..2f792888fb 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 8b2ccc1f73..8b2ccc1f73 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index 67e224f0be..67e224f0be 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index 5d4adfba2d..5d4adfba2d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index c7d86d9179..c7d86d9179 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 09b2b85c6a..09b2b85c6a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index e88b1e06c4..e88b1e06c4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index d3f996c5b4..d3f996c5b4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index 7c58d47f7c..7c58d47f7c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index 5be5a65c43..5be5a65c43 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index a40d5fa8de..a40d5fa8de 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 76f99408f2..76f99408f2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index d7594b0815..d7594b0815 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index e9fbcccc36..e9fbcccc36 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
index 6ef187c4e5..6ef187c4e5 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
index 59bc015c38..59bc015c38 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index ec4526cebf..ec4526cebf 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index 56ab28f0be..56ab28f0be 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 73a10d3b7f..73a10d3b7f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index c5c1e87756..c5c1e87756 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index 3e45568f01..3e45568f01 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index bdbf9d995b..bdbf9d995b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
index ba1a5c0a51..ba1a5c0a51 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
index 7c33b1d449..7c33b1d449 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
index d0ebff5fec..d0ebff5fec 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
index 6e4204b9b7..6e4204b9b7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
index cb3b6842c3..cb3b6842c3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
index 0c9de5bb31..0c9de5bb31 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
index 8746eb7f9b..8746eb7f9b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
index 6d124b0485..6d124b0485 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
index 8cf66e2fac..8cf66e2fac 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
index 5f361512f0..5f361512f0 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
index adc81ea5a2..adc81ea5a2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
index 4f6d0085af..4f6d0085af 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
index 98462bbabe..98462bbabe 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
index 994ed6aea3..994ed6aea3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
index d68d903375..d68d903375 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
index d4f8b0e6fa..d4f8b0e6fa 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
index a514b5e222..a514b5e222 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
index 452dee8d95..452dee8d95 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
index 85ca3798f4..85ca3798f4 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
index d8cdf1835a..d8cdf1835a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
index bb72fdbbf3..bb72fdbbf3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
index 606d333bb3..606d333bb3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
index 0ff9540502..0ff9540502 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
index 912bd16f9b..912bd16f9b 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
index 79f7959c72..79f7959c72 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
index 495a614d84..495a614d84 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
index 11cfc82ac2..11cfc82ac2 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
index e0e56d1017..e0e56d1017 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
index c706661eaa..c706661eaa 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
index c9a31deb27..c9a31deb27 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
index a6b55b8bae..a6b55b8bae 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
index e06a078a93..e06a078a93 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
index 0aec4d278d..0aec4d278d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
index d9bde48a5a..d9bde48a5a 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
index 9ff94f8313..9ff94f8313 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
index fd789e19cb..fd789e19cb 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
index 2e205f1d0f..2e205f1d0f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
index 52386aeef7..52386aeef7 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
index b7fbb69627..b7fbb69627 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
index dda8203f79..dda8203f79 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
index 20700a0392..20700a0392 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
index 213c7fbd7c..213c7fbd7c 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
index 92e18741ae..92e18741ae 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 153268983f..153268983f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
index 7ebc3fce85..7ebc3fce85 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
index 2c5a0d8159..2c5a0d8159 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
index d691705955..d691705955 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index 90551ec25d..90551ec25d 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index 6fc5f9398e..6fc5f9398e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index 5b7caf1010..5b7caf1010 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
index 0f4ed03b4e..0f4ed03b4e 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/enums.idl
index 2e4e829b0f..2e4e829b0f 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/enums.idl
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl
index b34ec46458..b34ec46458 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl
index db253338c3..db253338c3 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/references.idl b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/references.idl
index 72b58806e6..72b58806e6 100644
--- a/java/sca-contrib/modules/binding-corba-runtime/src/test/resources/references.idl
+++ b/sca-java-2.x/contrib/modules/binding-corba-runtime/src/test/resources/references.idl
diff --git a/java/sca-contrib/modules/binding-corba/LICENSE b/sca-java-2.x/contrib/modules/binding-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-corba/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-corba/LICENSE
diff --git a/java/sca-contrib/modules/binding-corba/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-corba/META-INF/MANIFEST.MF
index d41630838c..d41630838c 100644
--- a/java/sca-contrib/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-corba/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-corba/NOTICE b/sca-java-2.x/contrib/modules/binding-corba/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-corba/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-corba/NOTICE
diff --git a/java/sca-contrib/modules/binding-corba/pom.xml b/sca-java-2.x/contrib/modules/binding-corba/pom.xml
index fd6a3d12ff..fd6a3d12ff 100644
--- a/java/sca-contrib/modules/binding-corba/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-corba/pom.xml
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index 8ccce730cf..8ccce730cf 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
index 67e3bdcf74..67e3bdcf74 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
index cecb4fb567..cecb4fb567 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
index 54e98d4117..54e98d4117 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index 930a8d39d9..930a8d39d9 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
diff --git a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/sca-java-2.x/contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
index 57959840d4..57959840d4 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
diff --git a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 71d14bc077..71d14bc077 100644
--- a/java/sca-contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-dwr-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-dwr-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-dwr-runtime/pom.xml
index a32135306d..a32135306d 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index ae5cf327ab..ae5cf327ab 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
index d14751f235..d14751f235 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
index 24e6dbbcd4..24e6dbbcd4 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
index 1d073c9ecf..1d073c9ecf 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
index 7d5a7f1677..7d5a7f1677 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
index 3a2471d8f3..3a2471d8f3 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/java/sca-contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
index 1a9f91fab2..1a9f91fab2 100644
--- a/java/sca-contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ b/sca-java-2.x/contrib/modules/binding-dwr-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/java/sca-contrib/modules/binding-dwr/LICENSE b/sca-java-2.x/contrib/modules/binding-dwr/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-dwr/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-dwr/LICENSE
diff --git a/java/sca-contrib/modules/binding-dwr/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-dwr/META-INF/MANIFEST.MF
index cb22353d1e..cb22353d1e 100644
--- a/java/sca-contrib/modules/binding-dwr/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-dwr/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-dwr/NOTICE b/sca-java-2.x/contrib/modules/binding-dwr/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-dwr/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-dwr/NOTICE
diff --git a/java/sca-contrib/modules/binding-dwr/pom.xml b/sca-java-2.x/contrib/modules/binding-dwr/pom.xml
index b2a5d2fa8e..b2a5d2fa8e 100644
--- a/java/sca-contrib/modules/binding-dwr/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-dwr/pom.xml
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
index 02a5748fd8..02a5748fd8 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java
index fefe8dffbe..fefe8dffbe 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java
index cfd85d2e13..cfd85d2e13 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java
index 3e89d00a07..3e89d00a07 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/impl/DWRBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory b/sca-java-2.x/contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
index 889fcafae2..889fcafae2 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.dwr.DWRBindingFactory
diff --git a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 833b241aac..833b241aac 100644
--- a/java/sca-contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-ejb-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 6adfd6cb93..6adfd6cb93 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-ejb-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-ejb-runtime/pom.xml
index 357ecf9206..357ecf9206 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index c65868c23b..c65868c23b 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index 82554a1c8f..82554a1c8f 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index de8090c45b..de8090c45b 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 9247c1d3db..9247c1d3db 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index a6ea583d0b..a6ea583d0b 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 2a02bf0d08..2a02bf0d08 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index c7c0f90710..c7c0f90710 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 0b97f42746..0b97f42746 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index 119282adb9..119282adb9 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index 72f7dc9e43..72f7dc9e43 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index e60e526e01..e60e526e01 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 651c967aad..651c967aad 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e7ea7c9077..e7ea7c9077 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 346b7c5cf6..346b7c5cf6 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a89f711da9..a89f711da9 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
index 337bb004b5..337bb004b5 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java
index 8585301868..8585301868 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
index 7406b9bd37..7406b9bd37 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
index 799bcaa672..799bcaa672 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index e480e648d9..e480e648d9 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 0d02be3b95..0d02be3b95 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index 87616330dc..87616330dc 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 48e87fb6d1..48e87fb6d1 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 66b3feb458..66b3feb458 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/java/sca-contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index 14f77eed08..14f77eed08 100644
--- a/java/sca-contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-2.x/contrib/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/java/sca-contrib/modules/binding-ejb/LICENSE b/sca-java-2.x/contrib/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-ejb/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-ejb/LICENSE
diff --git a/java/sca-contrib/modules/binding-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-ejb/META-INF/MANIFEST.MF
index 5aa1b50c93..5aa1b50c93 100644
--- a/java/sca-contrib/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-ejb/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-ejb/NOTICE b/sca-java-2.x/contrib/modules/binding-ejb/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-ejb/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-ejb/NOTICE
diff --git a/java/sca-contrib/modules/binding-ejb/pom.xml b/sca-java-2.x/contrib/modules/binding-ejb/pom.xml
index 7fa7b2d6c3..7fa7b2d6c3 100644
--- a/java/sca-contrib/modules/binding-ejb/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-ejb/pom.xml
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index 271a113429..271a113429 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 6e2c8d358f..6e2c8d358f 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index e84de86eca..e84de86eca 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index 4abed80aa3..4abed80aa3 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 0320142dde..0320142dde 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
index c445a82ecb..c445a82ecb 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82e85ef067..82e85ef067 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/java/sca-contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-gdata-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
index 41d0fbf451..41d0fbf451 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-gdata-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-gdata-runtime/pom.xml
index 2670493cfe..2670493cfe 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
index b3d672b9d4..b3d672b9d4 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
index 174efef1bc..174efef1bc 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
index 91e3616ad9..91e3616ad9 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
index 312c1fe641..312c1fe641 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
index 4fa89fc634..4fa89fc634 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
index 9de4772a70..9de4772a70 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
index 3d476df764..3d476df764 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
index c20e44f7da..c20e44f7da 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
index 10faf74371..10faf74371 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5e380eb4e0..5e380eb4e0 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
index 5148e2ef2d..5148e2ef2d 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/main/resources/tuscany-binding-gdata.xsd
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
index 50a3ec3886..50a3ec3886 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
index e4d502357d..e4d502357d 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
index 7aa0a8961c..7aa0a8961c 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
index 488bfa0f71..488bfa0f71 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
index e283b6e023..e283b6e023 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
index 902d251200..902d251200 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
index 749dd41710..749dd41710 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
index cab7196a69..cab7196a69 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
index a9b12c3d32..a9b12c3d32 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
index 141f641575..141f641575 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties
index 33eaf11c1f..33eaf11c1f 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/log4j.properties
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
index a7941a2056..a7941a2056 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
index 078873c44f..078873c44f 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
index 7e0c925482..7e0c925482 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
index bc1ea7a8a9..bc1ea7a8a9 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
diff --git a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
index a4cf00dc84..a4cf00dc84 100644
--- a/java/sca-contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
+++ b/sca-java-2.x/contrib/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
diff --git a/java/sca-contrib/modules/binding-gdata/LICENSE b/sca-java-2.x/contrib/modules/binding-gdata/LICENSE
index d645695673..d645695673 100644
--- a/java/sca-contrib/modules/binding-gdata/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-gdata/LICENSE
diff --git a/java/sca-contrib/modules/binding-gdata/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-gdata/META-INF/MANIFEST.MF
index 6d5d52037e..6d5d52037e 100644
--- a/java/sca-contrib/modules/binding-gdata/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-gdata/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-gdata/NOTICE b/sca-java-2.x/contrib/modules/binding-gdata/NOTICE
index 841fb69681..841fb69681 100644
--- a/java/sca-contrib/modules/binding-gdata/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-gdata/NOTICE
diff --git a/java/sca-contrib/modules/binding-gdata/pom.xml b/sca-java-2.x/contrib/modules/binding-gdata/pom.xml
index 299e24e619..299e24e619 100644
--- a/java/sca-contrib/modules/binding-gdata/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-gdata/pom.xml
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
index a3a0b834cd..a3a0b834cd 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
index 5cfc688dcb..5cfc688dcb 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
index 87f3597248..87f3597248 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
index 409fd497ac..409fd497ac 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
index 660b96243e..660b96243e 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory b/sca-java-2.x/contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
index 21688a62a6..21688a62a6 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
diff --git a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e7c37c44fe..e7c37c44fe 100644
--- a/java/sca-contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-http-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-http-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-http-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 38d5bca016..38d5bca016 100644
--- a/java/sca-contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-http-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-http-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-http-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-http-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-http-runtime/pom.xml
index c78837d5cb..c78837d5cb 100644
--- a/java/sca-contrib/modules/binding-http-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
index 084f52026f..084f52026f 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index eb496f2421..eb496f2421 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 8f91ff4343..8f91ff4343 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index 493255655d..493255655d 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
index 1fe4600e31..1fe4600e31 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 0fa8d44c08..0fa8d44c08 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java
index d4aac125e5..d4aac125e5 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCaseFIXME.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index c6a5d64ce7..c6a5d64ce7 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
index 1d6efea2a1..1d6efea2a1 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
index 5728899ebe..5728899ebe 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
index f2456f3175..f2456f3175 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 333bacbab3..333bacbab3 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
index 9dbd6724b0..9dbd6724b0 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index 90cca27655..90cca27655 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/test.composite
index 62c4af4e22..62c4af4e22 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/testCache.composite
index d805402c4f..d805402c4f 100644
--- a/java/sca-contrib/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/contrib/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/java/sca-contrib/modules/binding-http/LICENSE b/sca-java-2.x/contrib/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-http/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-http/LICENSE
diff --git a/java/sca-contrib/modules/binding-http/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-http/META-INF/MANIFEST.MF
index a68b0c1e8d..a68b0c1e8d 100644
--- a/java/sca-contrib/modules/binding-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-http/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-http/NOTICE b/sca-java-2.x/contrib/modules/binding-http/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-http/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-http/NOTICE
diff --git a/java/sca-contrib/modules/binding-http/pom.xml b/sca-java-2.x/contrib/modules/binding-http/pom.xml
index a841f26df4..a841f26df4 100644
--- a/java/sca-contrib/modules/binding-http/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-http/pom.xml
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..6192b92dfe 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index e66896c68e..e66896c68e 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
index 023423f0eb..023423f0eb 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
index 69e44cf35c..69e44cf35c 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 678cd1a426..678cd1a426 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index 6d4bf92adc..6d4bf92adc 100644
--- a/java/sca-contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-2.x/contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
index 44da6b166c..44da6b166c 100644
--- a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc07784cb7..cc07784cb7 100644
--- a/java/sca-contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-jms-policy/LICENSE b/sca-java-2.x/contrib/modules/binding-jms-policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-jms-policy/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/LICENSE
diff --git a/java/sca-contrib/modules/binding-jms-policy/NOTICE b/sca-java-2.x/contrib/modules/binding-jms-policy/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-jms-policy/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/NOTICE
diff --git a/java/sca-contrib/modules/binding-jms-policy/pom.xml b/sca-java-2.x/contrib/modules/binding-jms-policy/pom.xml
index 56d79557b7..56d79557b7 100644
--- a/java/sca-contrib/modules/binding-jms-policy/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/pom.xml
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
index de54545f7e..de54545f7e 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
index 16ed2a53a4..16ed2a53a4 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
index 11747914da..11747914da 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
index fd77e57418..fd77e57418 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
index 17b5da42be..17b5da42be 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
index 610bf758d1..610bf758d1 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
index ec3be6e165..ec3be6e165 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
index 4278c1e595..4278c1e595 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
index 1c16e3fa1b..1c16e3fa1b 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
index d6167b4895..d6167b4895 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
index ded3da05b9..ded3da05b9 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
index 19069378ef..19069378ef 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
index 7a9318407e..7a9318407e 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e6f22e327c..e6f22e327c 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index b04c71d8e3..b04c71d8e3 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 0598cdc368..0598cdc368 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
index fd43b2c4e9..fd43b2c4e9 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
index 66ec011844..66ec011844 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/sca-java-2.x/contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
index a9da07ca7d..a9da07ca7d 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
diff --git a/java/sca-contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml b/sca-java-2.x/contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
index 3631c682aa..3631c682aa 100644
--- a/java/sca-contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
+++ b/sca-java-2.x/contrib/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
diff --git a/java/sca-contrib/modules/binding-jms-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-jms-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index 183f1446a6..183f1446a6 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-jms-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-jms-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-jms-runtime/pom.xml
index e4322210af..e4322210af 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
index bc2e783569..bc2e783569 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
index 8a73627ba3..8a73627ba3 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java
index a4d0ccafb3..a4d0ccafb3 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java
index d765e08d79..d765e08d79 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java
index 54c3eb54eb..54c3eb54eb 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
index d73b51e9ae..d73b51e9ae 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
index 44b2e3b990..44b2e3b990 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
index 9b8bee92c9..9b8bee92c9 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
index 499f69a24b..499f69a24b 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 998ac904a8..998ac904a8 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index adadc51a66..adadc51a66 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index aa66542f38..aa66542f38 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index da6c6d260d..da6c6d260d 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 821b9d7873..821b9d7873 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 09fe7310e6..09fe7310e6 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 773be84c7f..773be84c7f 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
index 57fbfb3215..57fbfb3215 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
index d0624fb52e..d0624fb52e 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index 477ec2c2ae..477ec2c2ae 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
index 33d4366fe6..33d4366fe6 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
index 5306e050e7..5306e050e7 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingListener.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index 32d024ec32..32d024ec32 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
index 6e5556df01..6e5556df01 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
index e84279cae1..e84279cae1 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
index ed17140ac3..ed17140ac3 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java
index 9f554b50e9..9f554b50e9 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java
index f990a9a0ba..f990a9a0ba 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java
index 65de548e58..65de548e58 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesReferenceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java
index 7c7c622fbc..7c7c622fbc 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java
index 60ea1c7ff4..60ea1c7ff4 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java
index 5811ca53e0..5811ca53e0 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java
index 9653c0d51e..9653c0d51e 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java
index b993ae9067..b993ae9067 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectReferenceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java
index 4bfbd2be0e..4bfbd2be0e 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java
index 9def71a6e0..9def71a6e0 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java
index 5480cc8165..5480cc8165 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java
index e317f42266..e317f42266 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java
index 7e749a96d6..7e749a96d6 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextReferenceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java
index 3dc2d0199d..3dc2d0199d 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java
index 6f9f0c9da9..6f9f0c9da9 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java
index 6bef4e8160..6bef4e8160 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java
index 86a5bbb4b2..86a5bbb4b2 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java
index b97084b5ad..b97084b5ad 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLReferenceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java
index ffec9d67f8..ffec9d67f8 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceInterceptor.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java
index 651a96f596..651a96f596 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4cb8e90b7a..4cb8e90b7a 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
index 50dfcdf9a0..50dfcdf9a0 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
index c82d4e7cab..c82d4e7cab 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index a3a2f0bf1e..a3a2f0bf1e 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index d68270f7df..d68270f7df 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index a8808c1bd1..a8808c1bd1 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/java/sca-contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite
+++ b/sca-java-2.x/contrib/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/java/sca-contrib/modules/binding-jms/LICENSE b/sca-java-2.x/contrib/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-jms/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-jms/LICENSE
diff --git a/java/sca-contrib/modules/binding-jms/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-jms/META-INF/MANIFEST.MF
index 0eb40a9005..0eb40a9005 100644
--- a/java/sca-contrib/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-jms/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-jms/NOTICE b/sca-java-2.x/contrib/modules/binding-jms/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-jms/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-jms/NOTICE
diff --git a/java/sca-contrib/modules/binding-jms/pom.xml b/sca-java-2.x/contrib/modules/binding-jms/pom.xml
index ba4bb7763e..ba4bb7763e 100644
--- a/java/sca-contrib/modules/binding-jms/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-jms/pom.xml
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
index ddc41a463a..ddc41a463a 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
index 74f030ca21..74f030ca21 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
index d96dadf8c5..d96dadf8c5 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
index b67ee97eb3..b67ee97eb3 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
index b6bb6fe67c..b6bb6fe67c 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
index 71d1298c9b..71d1298c9b 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
index 4a8e4a1bd2..4a8e4a1bd2 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
index 84d1a2740f..84d1a2740f 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
index 2d807d49cb..2d807d49cb 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
index 7e39f696bd..7e39f696bd 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
index 806b713931..806b713931 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
index fff33df1f4..fff33df1f4 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
index 9b675df290..9b675df290 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
index 23a53b9d96..23a53b9d96 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
index 8248fc771a..8248fc771a 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
index e299e54cbe..e299e54cbe 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingConstants.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
index 6b39a9d8d1..6b39a9d8d1 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/xml/JMSBindingProcessor.java
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
index f2d2c4bce1..f2d2c4bce1 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jms.JMSBindingFactory
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e5b8a96783..e5b8a96783 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
index 2f1048e601..2f1048e601 100644
--- a/java/sca-contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/java/sca-contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/sca-java-2.x/contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
index 6d59e41534..6d59e41534 100644
--- a/java/sca-contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 6bfa1e2eea..6bfa1e2eea 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/pom.xml
index c799bd309a..c799bd309a 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index a9fff462fa..a9fff462fa 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index eb85453bbb..eb85453bbb 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index e2528f59e5..e2528f59e5 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 8d9f8193e9..8d9f8193e9 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index 37a598e1ac..37a598e1ac 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
index 64339fda7b..64339fda7b 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
index 999588abf1..999588abf1 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4767358e7a..4767358e7a 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index c46e5698d1..c46e5698d1 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index bf8c7d2c8a..bf8c7d2c8a 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 3e7b848221..3e7b848221 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
index 47ce8f4433..47ce8f4433 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
index 0619831c06..0619831c06 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index ed73766202..ed73766202 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 978fdcfa7f..978fdcfa7f 100644
--- a/java/sca-contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/java/sca-contrib/modules/binding-jsonrpc/LICENSE b/sca-java-2.x/contrib/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/LICENSE
diff --git a/java/sca-contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index 925adb7118..925adb7118 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-jsonrpc/NOTICE b/sca-java-2.x/contrib/modules/binding-jsonrpc/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/NOTICE
diff --git a/java/sca-contrib/modules/binding-jsonrpc/pom.xml b/sca-java-2.x/contrib/modules/binding-jsonrpc/pom.xml
index f3f41200a3..f3f41200a3 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/pom.xml
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 3eefe697ac..3eefe697ac 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
index 707a9d7103..707a9d7103 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
index 625457a668..625457a668 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index b94a0015a7..b94a0015a7 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
index 8b9662997d..8b9662997d 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
diff --git a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 317e4940a4..317e4940a4 100644
--- a/java/sca-contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF
index 41ae005380..41ae005380 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/contrib/modules/binding-rest-runtime/pom.xml
index 5fb8fb12e2..5fb8fb12e2 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/pom.xml
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java
index c25a629829..c25a629829 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingForJersey.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
index 9b3f78133d..9b3f78133d 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
index cf6b51e5bf..cf6b51e5bf 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
index 0770934769..0770934769 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
index 67604832fc..67604832fc 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java
index 6a73f55649..6a73f55649 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceServlet.java
diff --git a/java/sca-contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4a682c1cb6..4a682c1cb6 100644
--- a/java/sca-contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-rest/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-rest/META-INF/MANIFEST.MF
index bd8e7e4972..bd8e7e4972 100644
--- a/java/sca-contrib/modules/binding-rest/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-rest/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-rest/pom.xml b/sca-java-2.x/contrib/modules/binding-rest/pom.xml
index 26ddb173d2..26ddb173d2 100644
--- a/java/sca-contrib/modules/binding-rest/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-rest/pom.xml
diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
index 6a3df42cc0..6a3df42cc0 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
index 0db1c827a1..0db1c827a1 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
index 3e68bc1cbd..3e68bc1cbd 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
index f7903c3842..f7903c3842 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory b/sca-java-2.x/contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
index 8b3c1c1420..8b3c1c1420 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
diff --git a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1a922c4621..1a922c4621 100644
--- a/java/sca-contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-rss-rome/LICENSE b/sca-java-2.x/contrib/modules/binding-rss-rome/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-rss-rome/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/LICENSE
diff --git a/java/sca-contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF
index 95f62ad91d..95f62ad91d 100644
--- a/java/sca-contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-rss-rome/NOTICE b/sca-java-2.x/contrib/modules/binding-rss-rome/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-rss-rome/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/NOTICE
diff --git a/java/sca-contrib/modules/binding-rss-rome/pom.xml b/sca-java-2.x/contrib/modules/binding-rss-rome/pom.xml
index f46851dbec..f46851dbec 100644
--- a/java/sca-contrib/modules/binding-rss-rome/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/pom.xml
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index 1124348158..1124348158 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index a2b83465da..a2b83465da 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index e3a177198c..e3a177198c 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 7eb5aeb3df..7eb5aeb3df 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index 216d8f3abe..216d8f3abe 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index 8a30e9d3fb..8a30e9d3fb 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index 4e5429ac83..4e5429ac83 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 489631ae3b..489631ae3b 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index a80f721136..a80f721136 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index 505a9cdee3..505a9cdee3 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index 42d64ef957..42d64ef957 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
index 43cd5e00b9..43cd5e00b9 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
index 5ffcb50eb8..5ffcb50eb8 100644
--- a/java/sca-contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
+++ b/sca-java-2.x/contrib/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/java/sca-contrib/modules/binding-rss/LICENSE b/sca-java-2.x/contrib/modules/binding-rss/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-rss/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-rss/LICENSE
diff --git a/java/sca-contrib/modules/binding-rss/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-rss/META-INF/MANIFEST.MF
index 51294d796d..51294d796d 100644
--- a/java/sca-contrib/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-rss/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-rss/NOTICE b/sca-java-2.x/contrib/modules/binding-rss/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-rss/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-rss/NOTICE
diff --git a/java/sca-contrib/modules/binding-rss/pom.xml b/sca-java-2.x/contrib/modules/binding-rss/pom.xml
index 0b1bf698ec..0b1bf698ec 100644
--- a/java/sca-contrib/modules/binding-rss/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-rss/pom.xml
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index 2b4989264c..2b4989264c 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index 6158752e7c..6158752e7c 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-2.x/contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2d0597ff01..2d0597ff01 100644
--- a/java/sca-contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-sca-axis2/LICENSE b/sca-java-2.x/contrib/modules/binding-sca-axis2/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/LICENSE
diff --git a/java/sca-contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF
index b9357df32d..b9357df32d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-sca-axis2/NOTICE b/sca-java-2.x/contrib/modules/binding-sca-axis2/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/NOTICE
diff --git a/java/sca-contrib/modules/binding-sca-axis2/pom.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/pom.xml
index eb02b3abdf..eb02b3abdf 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/pom.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
index 88a4b63637..88a4b63637 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index b105696b5d..b105696b5d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 59e0aa6494..59e0aa6494 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index f1aaa9188a..f1aaa9188a 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index cf13d821f7..cf13d821f7 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b369cde06..1b369cde06 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 0ae3c68f99..0ae3c68f99 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
index b345e563e3..b345e563e3 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
index 472e85116e..472e85116e 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index 5a68b6c3d9..5a68b6c3d9 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 3f48f1d465..3f48f1d465 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index 7196118775..7196118775 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index 0de092052f..0de092052f 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index e4d36ac78b..e4d36ac78b 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 5b2f73f9e2..5b2f73f9e2 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index f4c4354a39..f4c4354a39 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 7b8e00eb2a..7b8e00eb2a 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index 2cec5893a9..2cec5893a9 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index f4029e0ad5..f4029e0ad5 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 00fe836512..00fe836512 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index df9a09c5fb..df9a09c5fb 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index dcefef52e7..dcefef52e7 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index 628434108e..628434108e 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index 0dbb58272c..0dbb58272c 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2d2fe0146d..2d2fe0146d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index 219525e62d..219525e62d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index 20dd97b74a..20dd97b74a 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index b34d809958..b34d809958 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index b25aebd9df..b25aebd9df 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 5e4fd566c3..5e4fd566c3 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
index 093258051e..093258051e 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
index 8cf7230ed5..8cf7230ed5 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
index 066727f76d..066727f76d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
index 485e0815d2..485e0815d2 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
index a5a4f04cb5..a5a4f04cb5 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
index bf30bdf42d..bf30bdf42d 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
index b519793290..b519793290 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
index 20a6c54e6e..20a6c54e6e 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
index a76008d0c5..a76008d0c5 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
index 0c22af22ab..0c22af22ab 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
index d6b9e82250..d6b9e82250 100644
--- a/java/sca-contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-sca-corba/LICENSE b/sca-java-2.x/contrib/modules/binding-sca-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/binding-sca-corba/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/LICENSE
diff --git a/java/sca-contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF
index ede93bb946..ede93bb946 100644
--- a/java/sca-contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-sca-corba/NOTICE b/sca-java-2.x/contrib/modules/binding-sca-corba/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/binding-sca-corba/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/NOTICE
diff --git a/java/sca-contrib/modules/binding-sca-corba/pom.xml b/sca-java-2.x/contrib/modules/binding-sca-corba/pom.xml
index c7ae956137..c7ae956137 100644
--- a/java/sca-contrib/modules/binding-sca-corba/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/pom.xml
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
index 2eee714de6..2eee714de6 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
index 257be80807..257be80807 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
index 1cb532a46b..1cb532a46b 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
index c578f8bdf4..c578f8bdf4 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
index e8a76050e2..e8a76050e2 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
index 128d5ef159..128d5ef159 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
diff --git a/java/sca-contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e07a7cbb95..e07a7cbb95 100644
--- a/java/sca-contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/LICENSE b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/LICENSE
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF
index c37d874ae7..c37d874ae7 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/NOTICE b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/NOTICE
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/pom.xml b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/pom.xml
index 580982c52e..580982c52e 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/pom.xml
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java
index ba1ec6484f..ba1ec6484f 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/main/java/org/apache/tuscany/sca/binding/sca/xml/osoa/SCABindingProcessor.java
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6099dadbde..6099dadbde 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite
index 0be16ec536..0be16ec536 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/test/resources/Calculator.composite
diff --git a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType
index 55e8926504..55e8926504 100644
--- a/java/sca-contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/contrib/modules/binding-sca-xml-osoa/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/LICENSE b/sca-java-2.x/contrib/modules/binding-ws-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/LICENSE
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/LICENSE
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF
index a095f0d289..a095f0d289 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/NOTICE b/sca-java-2.x/contrib/modules/binding-ws-jaxws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/NOTICE
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/NOTICE
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/pom.xml b/sca-java-2.x/contrib/modules/binding-ws-jaxws/pom.xml
index 88c88d77a9..88c88d77a9 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/pom.xml
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/pom.xml
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
index ecb3b4f87b..ecb3b4f87b 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java
index 056f6de88b..056f6de88b 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProviderFactory.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java
index 13f38044af..13f38044af 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSReferenceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
index c93fcb267a..c93fcb267a 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSServiceBindingProvider.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 278db67112..278db67112 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
index 38dc930f10..38dc930f10 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastClient.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java
index d3b44450a7..d3b44450a7 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/java/weather/WeatherForecastImpl.java
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml
index db85bb2316..db85bb2316 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
index ff9692b982..ff9692b982 100644
--- a/java/sca-contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
+++ b/sca-java-2.x/contrib/modules/binding-ws-jaxws/src/test/resources/WeatherForecast.composite
diff --git a/java/sca-contrib/modules/common-xml/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/common-xml/META-INF/MANIFEST.MF
index ad4d6bd487..ad4d6bd487 100644
--- a/java/sca-contrib/modules/common-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/common-xml/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/common-xml/pom.xml b/sca-java-2.x/contrib/modules/common-xml/pom.xml
index 4b7a6df1d0..4b7a6df1d0 100644
--- a/java/sca-contrib/modules/common-xml/pom.xml
+++ b/sca-java-2.x/contrib/modules/common-xml/pom.xml
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java
index 8bdb8ae2df..8bdb8ae2df 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/SimpleTypeMapper.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java
index 895e4e476c..895e4e476c 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XSDDataTypeConverter.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
index db2ce906e1..db2ce906e1 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java
index 6b721583aa..6b721583aa 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/SAX2DOMAdapter.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java
index 4a5d4aaa6a..4a5d4aaa6a 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXMLStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
index 83ff31000d..83ff31000d 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java
index 21a857491b..21a857491b 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DelegatingNamespaceContext.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java
index 5942f23d20..5942f23d20 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValueArrayStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java
index b4b655d541..b4b655d541 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NameValuePairStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java
index 2ddcd4baa5..2ddcd4baa5 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NamedProperty.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java
index fc78807cdb..fc78807cdb 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/NilElementStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java
index a28705cff2..a28705cff2 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/SimpleXmlNodeImpl.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java
index 12550781d3..12550781d3 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAX2SAXAdapter.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
index 444d6ccabf..444d6ccabf 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java
index a237bb457e..a237bb457e 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/WrappingXMLStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java
index 8ee9ea2242..8ee9ea2242 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLDocumentStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java
index defe3595be..defe3595be 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReader.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java
index 2e42ac868f..2e42ac868f 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLFragmentStreamReaderImpl.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java
index 2a86611fcb..2a86611fcb 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamSerializer.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java
index b4b1a24f9d..b4b1a24f9d 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XMLStreamable.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java
index 75a820a620..75a820a620 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNode.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java
index 080f9c21e0..080f9c21e0 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlNodeIterator.java
diff --git a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java
index 93295b3d43..93295b3d43 100644
--- a/java/sca-contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderImpl.java
diff --git a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java b/sca-java-2.x/contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
index 220febe656..220febe656 100644
--- a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
diff --git a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java b/sca-java-2.x/contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java
index 4063314f3e..4063314f3e 100644
--- a/java/sca-contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-2.x/contrib/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/XmlTreeStreamReaderTestCase.java
diff --git a/java/sca-contrib/modules/compact-base/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/compact-base/META-INF/MANIFEST.MF
index f6590e5bb6..f6590e5bb6 100644
--- a/java/sca-contrib/modules/compact-base/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/compact-base/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/compact-base/pom.xml b/sca-java-2.x/contrib/modules/compact-base/pom.xml
index 628bf299a9..628bf299a9 100644
--- a/java/sca-contrib/modules/compact-base/pom.xml
+++ b/sca-java-2.x/contrib/modules/compact-base/pom.xml
diff --git a/java/sca-contrib/modules/contribution-osgi/LICENSE b/sca-java-2.x/contrib/modules/contribution-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/contribution-osgi/LICENSE
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/LICENSE
diff --git a/java/sca-contrib/modules/contribution-osgi/NOTICE b/sca-java-2.x/contrib/modules/contribution-osgi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/contribution-osgi/NOTICE
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/NOTICE
diff --git a/java/sca-contrib/modules/contribution-osgi/pom.xml b/sca-java-2.x/contrib/modules/contribution-osgi/pom.xml
index 71c90ca4ef..71c90ca4ef 100644
--- a/java/sca-contrib/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/pom.xml
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 0bbb8b707a..0bbb8b707a 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
index 5033d7eefc..5033d7eefc 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index b3c2302f60..b3c2302f60 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 07e80f66f3..07e80f66f3 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 528a287328..528a287328 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
index 15ad0bd948..15ad0bd948 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
index e624b1d3b5..e624b1d3b5 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index 632d135cb5..632d135cb5 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 02e8b411eb..02e8b411eb 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 8dec190930..8dec190930 100644
--- a/java/sca-contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-2.x/contrib/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/java/sca-contrib/modules/contribution-resource/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/contribution-resource/META-INF/MANIFEST.MF
index 364c48b8bc..364c48b8bc 100644
--- a/java/sca-contrib/modules/contribution-resource/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/contribution-resource/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/contribution-resource/pom.xml b/sca-java-2.x/contrib/modules/contribution-resource/pom.xml
index 14cf357291..14cf357291 100644
--- a/java/sca-contrib/modules/contribution-resource/pom.xml
+++ b/sca-java-2.x/contrib/modules/contribution-resource/pom.xml
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
index 0bd30c19dd..0bd30c19dd 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
index 07eac9d843..07eac9d843 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
index 4119c344ce..4119c344ce 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
index 5c6bb5e245..5c6bb5e245 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
index c2d525dfef..c2d525dfef 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
index fd568e533d..fd568e533d 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
index 885427e92c..885427e92c 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
index 880f5f5786..880f5f5786 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
index cd33f1290f..cd33f1290f 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
index 865ab8ff25..865ab8ff25 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 14eb81546d..14eb81546d 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 08d2b1c338..08d2b1c338 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
index d39a5065c2..d39a5065c2 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/java/sca-contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
index 9df66cce52..9df66cce52 100644
--- a/java/sca-contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
diff --git a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-2.x/contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
index 52ec0b4cfc..52ec0b4cfc 100644
--- a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-2.x/contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
index 1fc439f073..1fc439f073 100644
--- a/java/sca-contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/java/sca-contrib/modules/data-api/LICENSE b/sca-java-2.x/contrib/modules/data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/data-api/LICENSE
+++ b/sca-java-2.x/contrib/modules/data-api/LICENSE
diff --git a/java/sca-contrib/modules/data-api/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/data-api/META-INF/MANIFEST.MF
index 39743da4f3..39743da4f3 100644
--- a/java/sca-contrib/modules/data-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/data-api/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/data-api/NOTICE b/sca-java-2.x/contrib/modules/data-api/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/data-api/NOTICE
+++ b/sca-java-2.x/contrib/modules/data-api/NOTICE
diff --git a/java/sca-contrib/modules/data-api/pom.xml b/sca-java-2.x/contrib/modules/data-api/pom.xml
index 392c2871bf..392c2871bf 100644
--- a/java/sca-contrib/modules/data-api/pom.xml
+++ b/sca-java-2.x/contrib/modules/data-api/pom.xml
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
index f1841c975e..f1841c975e 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
index 5903fd95a4..5903fd95a4 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
index 37042c0895..37042c0895 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
index 229b29f5cd..229b29f5cd 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
index 69512058b7..69512058b7 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
index 7f13db5228..7f13db5228 100644
--- a/java/sca-contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
+++ b/sca-java-2.x/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/LICENSE b/sca-java-2.x/contrib/modules/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/LICENSE
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
index 8fc38ffe23..8fc38ffe23 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/NOTICE b/sca-java-2.x/contrib/modules/databinding-fastinfoset/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/NOTICE
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/pom.xml b/sca-java-2.x/contrib/modules/databinding-fastinfoset/pom.xml
index 955f9d615e..955f9d615e 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/pom.xml
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index 2e0aa629f3..2e0aa629f3 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 77f6b77636..77f6b77636 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index 73d549f4f8..73d549f4f8 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index 1c12a5dcad..1c12a5dcad 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b0d56b3bb6..b0d56b3bb6 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index d18206600c..d18206600c 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index bb8adf39be..bb8adf39be 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/java/sca-contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/java/sca-contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/java/sca-contrib/modules/databinding-json/LICENSE b/sca-java-2.x/contrib/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/java/sca-contrib/modules/databinding-json/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-json/LICENSE
diff --git a/java/sca-contrib/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-json/META-INF/MANIFEST.MF
index 8826f3b1b0..8826f3b1b0 100644
--- a/java/sca-contrib/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-json/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-json/NOTICE b/sca-java-2.x/contrib/modules/databinding-json/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-json/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-json/NOTICE
diff --git a/java/sca-contrib/modules/databinding-json/pom.xml b/sca-java-2.x/contrib/modules/databinding-json/pom.xml
index d1961bcdb6..d1961bcdb6 100644
--- a/java/sca-contrib/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-json/pom.xml
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index b1813c9eab..b1813c9eab 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4e08384f09..4e08384f09 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b70f772696..b70f772696 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 28cadc6666..28cadc6666 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index a928deef22..a928deef22 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index de023157bc..de023157bc 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index ff5968bccd..ff5968bccd 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index aa75afc9d4..aa75afc9d4 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index fb02d27b05..fb02d27b05 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 400507296f..400507296f 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b122533f6e..b122533f6e 100644
--- a/java/sca-contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 3c7f151ed7..3c7f151ed7 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/java/sca-contrib/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-2.x/contrib/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/java/sca-contrib/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/java/sca-contrib/modules/databinding-saxon/LICENSE b/sca-java-2.x/contrib/modules/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/java/sca-contrib/modules/databinding-saxon/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/LICENSE
diff --git a/java/sca-contrib/modules/databinding-saxon/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-saxon/META-INF/MANIFEST.MF
index 3c9e95f67d..3c9e95f67d 100644
--- a/java/sca-contrib/modules/databinding-saxon/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-saxon/NOTICE b/sca-java-2.x/contrib/modules/databinding-saxon/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-saxon/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/NOTICE
diff --git a/java/sca-contrib/modules/databinding-saxon/pom.xml b/sca-java-2.x/contrib/modules/databinding-saxon/pom.xml
index 33a379c107..33a379c107 100644
--- a/java/sca-contrib/modules/databinding-saxon/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/pom.xml
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 25f8ee886f..25f8ee886f 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
index 7122217b8b..7122217b8b 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index fabadd34ea..fabadd34ea 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index a5093f8cdf..a5093f8cdf 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
index 36ebac3aea..36ebac3aea 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1e5b816662..1e5b816662 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 616bcca6c5..616bcca6c5 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index ecb20b24b5..ecb20b24b5 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index ccf842710d..ccf842710d 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index 2f51cf86ec..2f51cf86ec 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 67d89a6e0b..67d89a6e0b 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
index 16d5f524bb..16d5f524bb 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index 7589f6789b..7589f6789b 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index 5da4effcfd..5da4effcfd 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
index 065121520b..065121520b 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e15021b972..e15021b972 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4d927ce53d..4d927ce53d 100644
--- a/java/sca-contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/LICENSE b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/LICENSE
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index 76259a7555..76259a7555 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/NOTICE b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/NOTICE
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/pom.xml b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/pom.xml
index 4737cfd963..4737cfd963 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/pom.xml
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index aa7f99724d..aa7f99724d 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index a55a9f37cb..a55a9f37cb 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f69ef598b8..f69ef598b8 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/java/sca-contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo/LICENSE b/sca-java-2.x/contrib/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/databinding-sdo/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/LICENSE
diff --git a/java/sca-contrib/modules/databinding-sdo/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-sdo/META-INF/MANIFEST.MF
index 798df260ff..798df260ff 100644
--- a/java/sca-contrib/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-sdo/NOTICE b/sca-java-2.x/contrib/modules/databinding-sdo/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-sdo/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/NOTICE
diff --git a/java/sca-contrib/modules/databinding-sdo/pom.xml b/sca-java-2.x/contrib/modules/databinding-sdo/pom.xml
index 6d2de7c2db..6d2de7c2db 100644
--- a/java/sca-contrib/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/pom.xml
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 503e54e530..503e54e530 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 8ce8eae587..8ce8eae587 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 116ac4c553..116ac4c553 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 7afb7d9463..7afb7d9463 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 1e2f3a795c..1e2f3a795c 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index 4a05492dd8..4a05492dd8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 695722be18..695722be18 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 0b58be9e41..0b58be9e41 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index c83ec53b01..c83ec53b01 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index 0927f87f3b..0927f87f3b 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 8a1cd666d8..8a1cd666d8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 7ac423f8d8..7ac423f8d8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index 4e5aa1d5fd..4e5aa1d5fd 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index e70fa08477..e70fa08477 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index baf3e2e90a..baf3e2e90a 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index ac452910f6..ac452910f6 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffe8b895b8..ffe8b895b8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 5ae557cc74..5ae557cc74 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 4bc41a5541..4bc41a5541 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 6a82a7fb18..6a82a7fb18 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 26c0f3ecb6..26c0f3ecb6 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 3c21b56c9f..3c21b56c9f 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 2aaae3c6d8..2aaae3c6d8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 11d8495de8..11d8495de8 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 114c568c38..114c568c38 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/java/sca-contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/LICENSE b/sca-java-2.x/contrib/modules/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100755
--- a/java/sca-contrib/modules/databinding-xmlbeans/LICENSE
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/LICENSE
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
index dfddbeb6c8..dfddbeb6c8 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/NOTICE b/sca-java-2.x/contrib/modules/databinding-xmlbeans/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/NOTICE
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/NOTICE
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/pom.xml b/sca-java-2.x/contrib/modules/databinding-xmlbeans/pom.xml
index bee5c8f44e..bee5c8f44e 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/pom.xml
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/pom.xml
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index e7b240b781..e7b240b781 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index 4e557522fe..4e557522fe 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
index 506c42e40f..506c42e40f 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index ca84f961b1..ca84f961b1 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index 9620d38eaf..9620d38eaf 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index bbffb7d748..bbffb7d748 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ac76c6ca9b..ac76c6ca9b 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 7b98ddb021..7b98ddb021 100644
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100755
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/java/sca-contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-2.x/contrib/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/java/sca-contrib/modules/domain-manager/LICENSE b/sca-java-2.x/contrib/modules/domain-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/domain-manager/LICENSE
+++ b/sca-java-2.x/contrib/modules/domain-manager/LICENSE
diff --git a/java/sca-contrib/modules/domain-manager/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/domain-manager/META-INF/MANIFEST.MF
index 482c048938..482c048938 100644
--- a/java/sca-contrib/modules/domain-manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/domain-manager/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/domain-manager/NOTICE b/sca-java-2.x/contrib/modules/domain-manager/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/domain-manager/NOTICE
+++ b/sca-java-2.x/contrib/modules/domain-manager/NOTICE
diff --git a/java/sca-contrib/modules/domain-manager/pom.xml b/sca-java-2.x/contrib/modules/domain-manager/pom.xml
index 2eec0d53be..2eec0d53be 100644
--- a/java/sca-contrib/modules/domain-manager/pom.xml
+++ b/sca-java-2.x/contrib/modules/domain-manager/pom.xml
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
index 65959645ae..65959645ae 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
index b4b9f5dc0f..b4b9f5dc0f 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
index a4f8f1722b..a4f8f1722b 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
index 3cf10fc587..3cf10fc587 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
index 46652984b9..46652984b9 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
index 58aab75855..58aab75855 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
index d36bf77c96..d36bf77c96 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
index d4f882185c..d4f882185c 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
index 1831728f07..1831728f07 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
index 21c7cd4383..21c7cd4383 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
index 644ebd86d0..644ebd86d0 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
index 22eff61840..22eff61840 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
index 7881217436..7881217436 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
index 695f25f480..695f25f480 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
index 9ab86ec2fc..9ab86ec2fc 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
index f7ae597c52..f7ae597c52 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
index c0afcc6efd..c0afcc6efd 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/DomainManager.composite b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/DomainManager.composite
index ba57ea45d1..ba57ea45d1 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/DomainManager.composite
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/DomainManager.composite
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/cloud-gadget.html
index 619df54ede..619df54ede 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/cloud-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/cloud.html
index d661d5d38b..d661d5d38b 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/cloud.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/cloud.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/composite-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/composite-gadget.html
index 82855a410a..82855a410a 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/composite-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/composite-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/composite.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/composite.html
index b0631e1d66..b0631e1d66 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/composite.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/composite.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/files-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/files-gadget.html
index 83315a1957..83315a1957 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/files-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/files-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/files.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/files.html
index 37d89e7665..37d89e7665 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/files.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/files.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/home-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/home-gadget.html
index 05e262e4df..05e262e4df 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/home-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/home-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/home.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/home.html
index aad1856621..aad1856621 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/home.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/home.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png
index a59728b2ad..a59728b2ad 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/icons/feed-icon.png
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/manager.css b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/manager.css
index e080ff1d87..e080ff1d87 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/manager.css
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/manager.css
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html
index c9389affc3..c9389affc3 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/toolbar-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/utils.js b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/utils.js
index 77ed807e85..77ed807e85 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/utils.js
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/utils.js
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace-gadget.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/workspace-gadget.html
index a4589b42e6..a4589b42e6 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace-gadget.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/workspace-gadget.html
diff --git a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace.html b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/workspace.html
index 36c02ab1e6..36c02ab1e6 100644
--- a/java/sca-contrib/modules/domain-manager/src/main/resources/workspace.html
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/main/resources/workspace.html
diff --git a/java/sca-contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/sca-java-2.x/contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
index 5e76556a14..5e76556a14 100644
--- a/java/sca-contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
index 4eab6dd5e7..4eab6dd5e7 100644
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
index 48d4be2d6e..48d4be2d6e 100644
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/domain-manager/src/test/resources/workspace.xml b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/workspace.xml
index e6ac7d7701..e6ac7d7701 100644
--- a/java/sca-contrib/modules/domain-manager/src/test/resources/workspace.xml
+++ b/sca-java-2.x/contrib/modules/domain-manager/src/test/resources/workspace.xml
diff --git a/java/sca-contrib/modules/host-corba-jee/LICENSE b/sca-java-2.x/contrib/modules/host-corba-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/host-corba-jee/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/LICENSE
diff --git a/java/sca-contrib/modules/host-corba-jee/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-corba-jee/META-INF/MANIFEST.MF
index 71fbb7e6a9..71fbb7e6a9 100644
--- a/java/sca-contrib/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-corba-jee/NOTICE b/sca-java-2.x/contrib/modules/host-corba-jee/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/host-corba-jee/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/NOTICE
diff --git a/java/sca-contrib/modules/host-corba-jee/pom.xml b/sca-java-2.x/contrib/modules/host-corba-jee/pom.xml
index 29cd6209ae..29cd6209ae 100644
--- a/java/sca-contrib/modules/host-corba-jee/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/pom.xml
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
index b5fe9f5d0f..b5fe9f5d0f 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
index 7e714c1ca5..7e714c1ca5 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3762550c01..3762550c01 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
index fd952a02c7..fd952a02c7 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
index a0b9b7c514..a0b9b7c514 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
index f480235fa8..f480235fa8 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
index f9f3d4789e..f9f3d4789e 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
index 9ed4c81248..9ed4c81248 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
index 357c1eddb0..357c1eddb0 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
index c2d4877791..c2d4877791 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
index 9846748775..9846748775 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
index cd722214ed..cd722214ed 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
index 6195f3af9c..6195f3af9c 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
diff --git a/java/sca-contrib/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/resources/general.idl
index 9194a37334..9194a37334 100644
--- a/java/sca-contrib/modules/host-corba-jee/src/test/resources/general.idl
+++ b/sca-java-2.x/contrib/modules/host-corba-jee/src/test/resources/general.idl
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/LICENSE b/sca-java-2.x/contrib/modules/host-corba-jse-tns/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/LICENSE
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
index 8edf701bf7..8edf701bf7 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/NOTICE b/sca-java-2.x/contrib/modules/host-corba-jse-tns/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/NOTICE
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/pom.xml b/sca-java-2.x/contrib/modules/host-corba-jse-tns/pom.xml
index 5014507384..5014507384 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/pom.xml
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
index 312d739c53..312d739c53 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
index 2dc2c7ddd4..2dc2c7ddd4 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 906ec4efce..906ec4efce 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
index 39d9191f80..39d9191f80 100644
--- a/java/sca-contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
diff --git a/java/sca-contrib/modules/host-corba-jse/LICENSE b/sca-java-2.x/contrib/modules/host-corba-jse/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/host-corba-jse/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/LICENSE
diff --git a/java/sca-contrib/modules/host-corba-jse/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-corba-jse/META-INF/MANIFEST.MF
index 060baa69b9..060baa69b9 100644
--- a/java/sca-contrib/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-corba-jse/NOTICE b/sca-java-2.x/contrib/modules/host-corba-jse/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/host-corba-jse/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/NOTICE
diff --git a/java/sca-contrib/modules/host-corba-jse/pom.xml b/sca-java-2.x/contrib/modules/host-corba-jse/pom.xml
index 72cb65f5b4..72cb65f5b4 100644
--- a/java/sca-contrib/modules/host-corba-jse/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/pom.xml
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
index 252a1512e4..252a1512e4 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index 015644e19d..015644e19d 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
index 59f0ce9a53..59f0ce9a53 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
index 599f5bca54..599f5bca54 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 77617a6c5c..77617a6c5c 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
index a7164e9ef3..a7164e9ef3 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
index 444143f173..444143f173 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a96baed33e..a96baed33e 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 8084e39956..8084e39956 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
index 8d1a9db9e9..8d1a9db9e9 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
index fe85dc7743..fe85dc7743 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
index 305a4d7b97..305a4d7b97 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
index f557d3e020..f557d3e020 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
index f993066dab..f993066dab 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
index 30a77deaf5..30a77deaf5 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
index 0ebde8ef0d..0ebde8ef0d 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/java/sca-contrib/modules/host-corba-jse/src/test/resources/general.idl b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/resources/general.idl
index f67566deb8..f67566deb8 100644
--- a/java/sca-contrib/modules/host-corba-jse/src/test/resources/general.idl
+++ b/sca-java-2.x/contrib/modules/host-corba-jse/src/test/resources/general.idl
diff --git a/java/sca-contrib/modules/host-corba/LICENSE b/sca-java-2.x/contrib/modules/host-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/host-corba/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-corba/LICENSE
diff --git a/java/sca-contrib/modules/host-corba/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-corba/META-INF/MANIFEST.MF
index 2b38d299c0..2b38d299c0 100644
--- a/java/sca-contrib/modules/host-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-corba/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-corba/NOTICE b/sca-java-2.x/contrib/modules/host-corba/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/host-corba/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-corba/NOTICE
diff --git a/java/sca-contrib/modules/host-corba/pom.xml b/sca-java-2.x/contrib/modules/host-corba/pom.xml
index b1e1281e17..b1e1281e17 100644
--- a/java/sca-contrib/modules/host-corba/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-corba/pom.xml
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index eb49f3f841..eb49f3f841 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
index 049bfdb6cd..049bfdb6cd 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
index 067b9193c5..067b9193c5 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
index b90fe9c78b..b90fe9c78b 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
index a380fd6d79..a380fd6d79 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
index 438734086d..438734086d 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 7e043667a9..7e043667a9 100644
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
index 6989b3ad06..6989b3ad06 100755
--- a/java/sca-contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
diff --git a/java/sca-contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-2.x/contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
index a72bed4ea8..a72bed4ea8 100644
--- a/java/sca-contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+++ b/sca-java-2.x/contrib/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
diff --git a/java/sca-contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-2.x/contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
index 4e076f9342..4e076f9342 100644
--- a/java/sca-contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
+++ b/sca-java-2.x/contrib/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
diff --git a/java/sca-contrib/modules/host-tomcat/LICENSE b/sca-java-2.x/contrib/modules/host-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/host-tomcat/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-tomcat/LICENSE
diff --git a/java/sca-contrib/modules/host-tomcat/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-tomcat/META-INF/MANIFEST.MF
index d6a87c4ae8..d6a87c4ae8 100644
--- a/java/sca-contrib/modules/host-tomcat/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-tomcat/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-tomcat/NOTICE b/sca-java-2.x/contrib/modules/host-tomcat/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/host-tomcat/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-tomcat/NOTICE
diff --git a/java/sca-contrib/modules/host-tomcat/pom.xml b/sca-java-2.x/contrib/modules/host-tomcat/pom.xml
index 826a58deee..826a58deee 100644
--- a/java/sca-contrib/modules/host-tomcat/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-tomcat/pom.xml
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index a0b384d554..a0b384d554 100644
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
index 5d9b65503a..5d9b65503a 100644
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index 5ea1701c05..5ea1701c05 100644
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 070dffdce6..070dffdce6 100644
--- a/java/sca-contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/java/sca-contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/java/sca-contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-2.x/contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index afbec52cd9..afbec52cd9 100644
--- a/java/sca-contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/java/sca-contrib/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-2.x/contrib/modules/host-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/java/sca-contrib/modules/host-tomcat/src/test/resources/content/test.html
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/java/sca-contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore b/sca-java-2.x/contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/java/sca-contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/contrib/modules/host-tomcat/src/test/resources/tuscany.keyStore
diff --git a/java/sca-contrib/modules/host-webapp-junit/LICENSE b/sca-java-2.x/contrib/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/host-webapp-junit/LICENSE
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/LICENSE
diff --git a/java/sca-contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF
index 56b597c164..56b597c164 100644
--- a/java/sca-contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/host-webapp-junit/NOTICE b/sca-java-2.x/contrib/modules/host-webapp-junit/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/host-webapp-junit/NOTICE
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/NOTICE
diff --git a/java/sca-contrib/modules/host-webapp-junit/pom.xml b/sca-java-2.x/contrib/modules/host-webapp-junit/pom.xml
index 443b55b8a9..443b55b8a9 100644
--- a/java/sca-contrib/modules/host-webapp-junit/pom.xml
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/pom.xml
diff --git a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/sca-java-2.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index b2d3d0abf1..b2d3d0abf1 100644
--- a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/sca-java-2.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index 72ec478cd6..72ec478cd6 100644
--- a/java/sca-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ b/sca-java-2.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/LICENSE b/sca-java-2.x/contrib/modules/implementation-bpel-ode/LICENSE
index baba9ca048..baba9ca048 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/LICENSE
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index 552581efb6..552581efb6 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/NOTICE b/sca-java-2.x/contrib/modules/implementation-bpel-ode/NOTICE
index 61ea4111aa..61ea4111aa 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/NOTICE
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/pom.xml b/sca-java-2.x/contrib/modules/implementation-bpel-ode/pom.xml
index 02eccc899a..02eccc899a 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/pom.xml
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
index 20373d0819..20373d0819 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index ed327331db..ed327331db 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index 11af0f8b50..11af0f8b50 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 3f2db7b244..3f2db7b244 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index a6428f6984..a6428f6984 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
index 15e9229601..15e9229601 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index 1ec82390cf..1ec82390cf 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
index 328403e626..328403e626 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
index 8f8f608217..8f8f608217 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index c626e6a8e3..c626e6a8e3 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index c644b6a965..c644b6a965 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
index ed327e237b..ed327e237b 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index f301082d59..f301082d59 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 3bce8aa9ab..3bce8aa9ab 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
index 0f59990377..0f59990377 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
index bcd3ea6afa..bcd3ea6afa 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties
index 82b3c09723..82b3c09723 100644
--- a/java/sca-contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties
+++ b/sca-java-2.x/contrib/modules/implementation-bpel-ode/src/test/resources/log4j.properties
diff --git a/java/sca-contrib/modules/implementation-bpel/LICENSE b/sca-java-2.x/contrib/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/java/sca-contrib/modules/implementation-bpel/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/LICENSE
diff --git a/java/sca-contrib/modules/implementation-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-bpel/META-INF/MANIFEST.MF
index ba65f8632d..ba65f8632d 100644
--- a/java/sca-contrib/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-bpel/NOTICE b/sca-java-2.x/contrib/modules/implementation-bpel/NOTICE
index 61ea4111aa..61ea4111aa 100644
--- a/java/sca-contrib/modules/implementation-bpel/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/NOTICE
diff --git a/java/sca-contrib/modules/implementation-bpel/pom.xml b/sca-java-2.x/contrib/modules/implementation-bpel/pom.xml
index c0f92f1c1d..c0f92f1c1d 100644
--- a/java/sca-contrib/modules/implementation-bpel/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/pom.xml
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index 9f8f9c0e9a..9f8f9c0e9a 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index d54add5391..d54add5391 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index a6518ed11b..a6518ed11b 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
index f9b95c7da8..f9b95c7da8 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index f1c943e49c..f1c943e49c 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 5ce4f91376..5ce4f91376 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index 43606cb216..43606cb216 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 92c38123a1..92c38123a1 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
index bf0020323c..bf0020323c 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
index b7f5d1d3f2..b7f5d1d3f2 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
index fdaf98a97f..fdaf98a97f 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 03ef3e3a7f..03ef3e3a7f 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f6fd442f56..f6fd442f56 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 4276e938f1..4276e938f1 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/java/sca-contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
index b6d8bdc0f1..b6d8bdc0f1 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index e355b7adf9..e355b7adf9 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 28cc562a3b..28cc562a3b 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 1d71727b2d..1d71727b2d 100644
--- a/java/sca-contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/contrib/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/java/sca-contrib/modules/implementation-ejb/LICENSE b/sca-java-2.x/contrib/modules/implementation-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-ejb/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/LICENSE
diff --git a/java/sca-contrib/modules/implementation-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-ejb/META-INF/MANIFEST.MF
index 17dc48478c..17dc48478c 100644
--- a/java/sca-contrib/modules/implementation-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-ejb/NOTICE b/sca-java-2.x/contrib/modules/implementation-ejb/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-ejb/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/NOTICE
diff --git a/java/sca-contrib/modules/implementation-ejb/pom.xml b/sca-java-2.x/contrib/modules/implementation-ejb/pom.xml
index 472f8f81ed..472f8f81ed 100644
--- a/java/sca-contrib/modules/implementation-ejb/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/pom.xml
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
index 0d3b05f0c9..0d3b05f0c9 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
index bf9e13069b..bf9e13069b 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
index 050d0cf17a..050d0cf17a 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
index bf2e6354d5..bf2e6354d5 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
index 573bd7ef17..573bd7ef17 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ae6db609a2..ae6db609a2 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
index fb828707a6..fb828707a6 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
index 4eaf2b9007..4eaf2b9007 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
index ffbdf1d54c..ffbdf1d54c 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
index 8ba43dd635..8ba43dd635 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/java/sca-contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
index 0c1368c4dd..0c1368c4dd 100644
--- a/java/sca-contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
+++ b/sca-java-2.x/contrib/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/LICENSE b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/LICENSE
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF
index 0b3527e3cb..0b3527e3cb 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/NOTICE b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/NOTICE
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/pom.xml b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/pom.xml
index 23a09e47bb..23a09e47bb 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/pom.xml
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java
index 895c6d2edb..895c6d2edb 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationConstants.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java
index 59e0cf2e6c..59e0cf2e6c 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/java/org/apache/tuscany/sca/implementation/java/xml/osoa/JavaImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index d49774908d..d49774908d 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties
index 210b715da8..210b715da8 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddService.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..3f28d740a7 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideService.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index a58fa0c072..a58fa0c072 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 5142737b32..5142737b32 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index e49359f3ee..e49359f3ee 100644
--- a/java/sca-contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-2.x/contrib/modules/implementation-java-xml-osoa/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/java/sca-contrib/modules/implementation-node-runtime/LICENSE b/sca-java-2.x/contrib/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/LICENSE
diff --git a/java/sca-contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF
index 114dd2af2f..114dd2af2f 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-node-runtime/NOTICE b/sca-java-2.x/contrib/modules/implementation-node-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/NOTICE
diff --git a/java/sca-contrib/modules/implementation-node-runtime/pom.xml b/sca-java-2.x/contrib/modules/implementation-node-runtime/pom.xml
index 1db4bcfd24..1db4bcfd24 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/pom.xml
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index e4e88003c7..e4e88003c7 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 9a9a4d8ddf..9a9a4d8ddf 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index 62a822a85e..62a822a85e 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
index 5895a8614d..5895a8614d 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
index 6cdb18938e..6cdb18938e 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
index e2a3e4df92..e2a3e4df92 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index f6a601a3cd..f6a601a3cd 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index b6d2f3d643..b6d2f3d643 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 306b53be5b..306b53be5b 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index 579dd5e390..579dd5e390 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index b8f6dcceb9..b8f6dcceb9 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index 3e719ef6ab..3e719ef6ab 100644
--- a/java/sca-contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-2.x/contrib/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/java/sca-contrib/modules/implementation-node/LICENSE b/sca-java-2.x/contrib/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-node/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-node/LICENSE
diff --git a/java/sca-contrib/modules/implementation-node/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-node/META-INF/MANIFEST.MF
index 18dcfedd29..18dcfedd29 100644
--- a/java/sca-contrib/modules/implementation-node/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-node/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-node/NOTICE b/sca-java-2.x/contrib/modules/implementation-node/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-node/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-node/NOTICE
diff --git a/java/sca-contrib/modules/implementation-node/pom.xml b/sca-java-2.x/contrib/modules/implementation-node/pom.xml
index d26d870994..d26d870994 100644
--- a/java/sca-contrib/modules/implementation-node/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-node/pom.xml
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d4755f4071..d4755f4071 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index 527698ea91..527698ea91 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
index 14046065b5..14046065b5 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index 706a657654..706a657654 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index daa1e54333..daa1e54333 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index 8ed57a8a0e..8ed57a8a0e 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index fc5a85c956..fc5a85c956 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index c928916667..c928916667 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d93ff3408..1d93ff3408 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
index b8a63a3b16..b8a63a3b16 100644
--- a/java/sca-contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
index c8f1ee81c8..c8f1ee81c8 100644
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index 8720d5c607..8720d5c607 100644
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index de1506ae59..de1506ae59 100644
--- a/java/sca-contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-2.x/contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index b8f6dcceb9..b8f6dcceb9 100644
--- a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-2.x/contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index ef096fe5ae..ef096fe5ae 100644
--- a/java/sca-contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-2.x/contrib/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/java/sca-contrib/modules/implementation-osgi/LICENSE b/sca-java-2.x/contrib/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/java/sca-contrib/modules/implementation-osgi/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/LICENSE
diff --git a/java/sca-contrib/modules/implementation-osgi/NOTICE b/sca-java-2.x/contrib/modules/implementation-osgi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-osgi/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/NOTICE
diff --git a/java/sca-contrib/modules/implementation-osgi/pom.xml b/sca-java-2.x/contrib/modules/implementation-osgi/pom.xml
index fbe98efefc..fbe98efefc 100644
--- a/java/sca-contrib/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/pom.xml
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 7bcb0a1da5..7bcb0a1da5 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
index e5a726c8c0..e5a726c8c0 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
index 8eee337638..8eee337638 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
index 38befa611b..38befa611b 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index fe3efd22cd..fe3efd22cd 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 5664c77618..5664c77618 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
index 814d37f203..814d37f203 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
index a4fb1ec2ca..a4fb1ec2ca 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
index deb44d26fb..deb44d26fb 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
index deb39a47cd..deb39a47cd 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index 7f246cb76c..7f246cb76c 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ecff71874..9ecff71874 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index c2cd957351..c2cd957351 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
index 2503be0b13..2503be0b13 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
index fb4cb4207a..fb4cb4207a 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
index 6a6d80f15e..6a6d80f15e 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
index 93b4dee033..93b4dee033 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
index d412f6bd6a..d412f6bd6a 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
index feb9ce177e..feb9ce177e 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
index e59032e3ea..e59032e3ea 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 1831587896..1831587896 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index e1bbd97655..e1bbd97655 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 254ce99d59..254ce99d59 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 0b31145407..0b31145407 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5465eec8d9..5465eec8d9 100644
--- a/java/sca-contrib/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-2.x/contrib/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/java/sca-contrib/modules/implementation-pojo/LICENSE b/sca-java-2.x/contrib/modules/implementation-pojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-pojo/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/LICENSE
diff --git a/java/sca-contrib/modules/implementation-pojo/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-pojo/META-INF/MANIFEST.MF
index 298921a55f..298921a55f 100644
--- a/java/sca-contrib/modules/implementation-pojo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-pojo/NOTICE b/sca-java-2.x/contrib/modules/implementation-pojo/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-pojo/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/NOTICE
diff --git a/java/sca-contrib/modules/implementation-pojo/pom.xml b/sca-java-2.x/contrib/modules/implementation-pojo/pom.xml
index 2a93a36593..2a93a36593 100644
--- a/java/sca-contrib/modules/implementation-pojo/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/pom.xml
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
index 5f81353606..5f81353606 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaConstructor.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
index 19d452d07f..19d452d07f 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaElement.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java
index 28375c86f8..28375c86f8 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaFactory.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
index d5ded915db..d5ded915db 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaParameter.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
index 38fbf75a71..38fbf75a71 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/JavaResource.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
index 36a87420ab..36a87420ab 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaConstructorImpl.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
index fc3ca3238f..fc3ca3238f 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaElementImpl.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java
index d1b7d4c5ad..d1b7d4c5ad 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
index 417644be14..417644be14 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaParameterImpl.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
index 5a36a21db8..5a36a21db8 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/java/org/apache/tuscany/sca/pojo/impl/JavaResourceImpl.java
diff --git a/java/sca-contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory
index 5ed06a8dcd..5ed06a8dcd 100644
--- a/java/sca-contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory
+++ b/sca-java-2.x/contrib/modules/implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.pojo.JavaFactory
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/LICENSE b/sca-java-2.x/contrib/modules/implementation-resource-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/LICENSE
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
index 586b890ecc..586b890ecc 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/NOTICE b/sca-java-2.x/contrib/modules/implementation-resource-runtime/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/NOTICE
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/pom.xml b/sca-java-2.x/contrib/modules/implementation-resource-runtime/pom.xml
index 3f28bd9480..3f28bd9480 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/pom.xml
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
index 582795625d..582795625d 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
index a974f68a7e..a974f68a7e 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
index 47e70b5581..47e70b5581 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 656d8c2751..656d8c2751 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
index 9b3c959753..9b3c959753 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/resources/content/test.html
diff --git a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite
index 4654056cd7..4654056cd7 100644
--- a/java/sca-contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite
+++ b/sca-java-2.x/contrib/modules/implementation-resource-runtime/src/test/resources/resource.composite
diff --git a/java/sca-contrib/modules/implementation-resource/LICENSE b/sca-java-2.x/contrib/modules/implementation-resource/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/implementation-resource/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-resource/LICENSE
diff --git a/java/sca-contrib/modules/implementation-resource/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-resource/META-INF/MANIFEST.MF
index 89e37fe4e3..89e37fe4e3 100644
--- a/java/sca-contrib/modules/implementation-resource/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-resource/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-resource/NOTICE b/sca-java-2.x/contrib/modules/implementation-resource/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/implementation-resource/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-resource/NOTICE
diff --git a/java/sca-contrib/modules/implementation-resource/pom.xml b/sca-java-2.x/contrib/modules/implementation-resource/pom.xml
index 2562e253bf..2562e253bf 100644
--- a/java/sca-contrib/modules/implementation-resource/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-resource/pom.xml
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
index 68219de701..68219de701 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
index be136ee792..be136ee792 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
index 95ac452c66..95ac452c66 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
index 2eb7b681b6..2eb7b681b6 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
index 9cad0890a3..9cad0890a3 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
index 9c1453fba3..9c1453fba3 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b5774c5c5b..b5774c5c5b 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
index f77f723c3e..f77f723c3e 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
index 7f619ef036..7f619ef036 100644
--- a/java/sca-contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-script-runtime/LICENSE b/sca-java-2.x/contrib/modules/implementation-script-runtime/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/LICENSE
diff --git a/java/sca-contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF
index aed41dbb4f..aed41dbb4f 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-script-runtime/NOTICE b/sca-java-2.x/contrib/modules/implementation-script-runtime/NOTICE
index ecbcc6a660..ecbcc6a660 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/NOTICE
diff --git a/java/sca-contrib/modules/implementation-script-runtime/pom.xml b/sca-java-2.x/contrib/modules/implementation-script-runtime/pom.xml
index e2e0f59ce5..e2e0f59ce5 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/pom.xml
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index 324246c32b..324246c32b 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
index 473b990a79..473b990a79 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
index f65403c9ed..f65403c9ed 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
index 976eb2c0dd..976eb2c0dd 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
index 5833c9f4d5..5833c9f4d5 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 941cfd7fd5..941cfd7fd5 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index f098885741..f098885741 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index 1af3a295a4..1af3a295a4 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 6a4f10dbbb..6a4f10dbbb 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index f87cf104f3..f87cf104f3 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index cffe65c27a..cffe65c27a 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index ca4bd5ae6a..ca4bd5ae6a 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 46ed9abce6..46ed9abce6 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index d694515829..d694515829 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index e7375253a3..e7375253a3 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index f93edc76d1..f93edc76d1 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 910d22ec83..910d22ec83 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index 719212e831..719212e831 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 60c73359c0..60c73359c0 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index cde96b4b9b..cde96b4b9b 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index 0e6be74e09..0e6be74e09 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 6116581356..6116581356 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index dfcd37c46c..dfcd37c46c 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 83c2e99469..83c2e99469 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 392e16411c..392e16411c 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 8866ae6b70..8866ae6b70 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index ce377e4ed3..ce377e4ed3 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 4d32ed9f6b..4d32ed9f6b 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 13cb94d511..13cb94d511 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index c641b82cd6..c641b82cd6 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 26574c6266..26574c6266 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index a3551cefc3..a3551cefc3 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index f72c6e922f..f72c6e922f 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index bd754c8d2e..bd754c8d2e 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 175bb79104..175bb79104 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 7581b633cc..7581b633cc 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index 91085b9eb2..91085b9eb2 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 535164aae7..535164aae7 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/java/sca-contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-2.x/contrib/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/java/sca-contrib/modules/implementation-script/LICENSE b/sca-java-2.x/contrib/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/java/sca-contrib/modules/implementation-script/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-script/LICENSE
diff --git a/java/sca-contrib/modules/implementation-script/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-script/META-INF/MANIFEST.MF
index dd96f10c3a..dd96f10c3a 100644
--- a/java/sca-contrib/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-script/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-script/NOTICE b/sca-java-2.x/contrib/modules/implementation-script/NOTICE
index ecbcc6a660..ecbcc6a660 100644
--- a/java/sca-contrib/modules/implementation-script/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-script/NOTICE
diff --git a/java/sca-contrib/modules/implementation-script/pom.xml b/sca-java-2.x/contrib/modules/implementation-script/pom.xml
index 84b81a57d7..84b81a57d7 100644
--- a/java/sca-contrib/modules/implementation-script/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-script/pom.xml
diff --git a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-2.x/contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 9dc8f2aeca..9dc8f2aeca 100644
--- a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
index 1aec9d0df3..1aec9d0df3 100644
--- a/java/sca-contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 794fe423b0..794fe423b0 100644
--- a/java/sca-contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/LICENSE b/sca-java-2.x/contrib/modules/implementation-spring-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/LICENSE
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
index ea29fcdb24..ea29fcdb24 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/NOTICE b/sca-java-2.x/contrib/modules/implementation-spring-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/NOTICE
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/pom.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/pom.xml
index fc8b406acb..fc8b406acb 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/pom.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
index 6ed1840b6b..6ed1840b6b 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAApplicationContext.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
index 4e1c861910..4e1c861910 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCANamespaceHandlerResolver.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
index d654d1172a..d654d1172a 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/SCAParentApplicationContext.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
index 5f7614a68e..5f7614a68e 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaNamespaceHandler.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
index a025d23b9f..a025d23b9f 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaPropertyBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
index 178f538339..178f538339 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaReferenceBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
index ae5093dbea..ae5093dbea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/impl/ScaServiceBeanDefinitionParser.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
index f780c71549..f780c71549 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
index eb83a92f6a..eb83a92f6a 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
index a195549851..a195549851 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvocationException.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
index b63518d1c7..b63518d1c7 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/provider/SpringInvoker.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6edfc3b6ca..6edfc3b6ca 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
index d782384ce6..d782384ce6 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
index c9b30b1688..c9b30b1688 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
index 935ff19992..935ff19992 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
index 65ab096855..65ab096855 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
index 0c912fddfa..0c912fddfa 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
index d77f183a66..d77f183a66 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccessTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
index 86f979fe15..86f979fe15 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
index 44016ad249..44016ad249 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
index 74dcf32723..74dcf32723 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
index 97f91ff91e..97f91ff91e 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
index bfe3d64cf3..bfe3d64cf3 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorldTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
index 2c46f8c066..2c46f8c066 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
index 4d60bffef8..4d60bffef8 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
index acad9f2fea..acad9f2fea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
index 79de2b32a0..79de2b32a0 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestContextAccessBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
index f165bb8b75..f165bb8b75 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
index a1d9b5a2f4..a1d9b5a2f4 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
index ab4c07d059..ab4c07d059 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
index 0f00c7e480..0f00c7e480 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
index a7d30bf201..a7d30bf201 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringContextAccess-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
index 7c358ac01c..7c358ac01c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
index 38e90b41fa..38e90b41fa 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-Imported-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
index e6b69e8cad..e6b69e8cad 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
index 8e18a56cca..8e18a56cca 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/SpringImportHelloWorld-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
index fdbbeeced2..fdbbeeced2 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testReferenceContext.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
index 6b3f1f9890..6b3f1f9890 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/META-INF/sca/testServiceContext.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
index 18ce21805c..18ce21805c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/SpringHelloWorld-Imported-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
index 0b260b5dcf..0b260b5dcf 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringContextAccess.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
index 79f4041fe6..79f4041fe6 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
index 87353b69ea..87353b69ea 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
index ebb693d243..ebb693d243 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
index 9f51277d22..9f51277d22 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
index 95dd9131eb..95dd9131eb 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImportHelloWorld.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
index af1b3be0a5..af1b3be0a5 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
index f1ee21686d..f1ee21686d 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/spring/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
index f2d684f766..f2d684f766 100644
--- a/java/sca-contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring-runtime/src/test/resources/test.xml
diff --git a/java/sca-contrib/modules/implementation-spring/LICENSE b/sca-java-2.x/contrib/modules/implementation-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-spring/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-spring/LICENSE
diff --git a/java/sca-contrib/modules/implementation-spring/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-spring/META-INF/MANIFEST.MF
index 8c8d152708..8c8d152708 100644
--- a/java/sca-contrib/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-spring/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-spring/NOTICE b/sca-java-2.x/contrib/modules/implementation-spring/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-spring/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-spring/NOTICE
diff --git a/java/sca-contrib/modules/implementation-spring/pom.xml b/sca-java-2.x/contrib/modules/implementation-spring/pom.xml
index 16b50a0aea..16b50a0aea 100644
--- a/java/sca-contrib/modules/implementation-spring/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-spring/pom.xml
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
index 35df76fabc..35df76fabc 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 8bf3e5ed3c..8bf3e5ed3c 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
index 1b6ba953c7..1b6ba953c7 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index 6e0987791b..6e0987791b 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 689ac27f0f..689ac27f0f 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 129a15e72e..129a15e72e 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index fbc0e2b36f..fbc0e2b36f 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index 48c727baab..48c727baab 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
index 92f980fdfe..92f980fdfe 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/Constants.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
index f9a9fee58f..f9a9fee58f 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
index e5f8030b90..e5f8030b90 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
index 57f4a26ba3..57f4a26ba3 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringConstructorArgElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
index 39e1286f32..39e1286f32 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
index 2f37ab6504..2f37ab6504 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
index b3f45415fd..b3f45415fd 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
index 2eb5686270..2eb5686270 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
index d7d1d55cbf..d7d1d55cbf 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4b71cef6c4..4b71cef6c4 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
index 7f9a7b17b0..7f9a7b17b0 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 6fce02664a..6fce02664a 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index e20f4e8158..e20f4e8158 100644
--- a/java/sca-contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-2.x/contrib/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/LICENSE b/sca-java-2.x/contrib/modules/implementation-widget-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/LICENSE
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index bd616d5740..bd616d5740 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/NOTICE b/sca-java-2.x/contrib/modules/implementation-widget-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/NOTICE
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/pom.xml b/sca-java-2.x/contrib/modules/implementation-widget-runtime/pom.xml
index 8efb922c17..8efb922c17 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/pom.xml
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index d9616de359..d9616de359 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 61176d912c..61176d912c 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index c57680fa1c..c57680fa1c 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
index 67520e2733..67520e2733 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js
index c64c3fc97c..c64c3fc97c 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/atomModel.js
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
index 2719e9a9b9..2719e9a9b9 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js
index 60bd841679..60bd841679 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-http.js
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
index ca3c2a8605..ca3c2a8605 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
index 3d559c20d5..3d559c20d5 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
index 5dd7d70e6c..5dd7d70e6c 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
index 1a34094cc5..1a34094cc5 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
index 37e8d0161a..37e8d0161a 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
index c64c3fc97c..c64c3fc97c 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
index 58f9f560a7..58f9f560a7 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
index 6bbc285377..6bbc285377 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
index 352dd85508..352dd85508 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
index f23d6a20f5..f23d6a20f5 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
index e44a56e520..e44a56e520 100644
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ b/sca-java-2.x/contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
diff --git a/java/sca-contrib/modules/implementation-widget/LICENSE b/sca-java-2.x/contrib/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/implementation-widget/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-widget/LICENSE
diff --git a/java/sca-contrib/modules/implementation-widget/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-widget/META-INF/MANIFEST.MF
index f112dd57bf..f112dd57bf 100644
--- a/java/sca-contrib/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-widget/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-widget/NOTICE b/sca-java-2.x/contrib/modules/implementation-widget/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-widget/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-widget/NOTICE
diff --git a/java/sca-contrib/modules/implementation-widget/pom.xml b/sca-java-2.x/contrib/modules/implementation-widget/pom.xml
index 85777f47ea..85777f47ea 100644
--- a/java/sca-contrib/modules/implementation-widget/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-widget/pom.xml
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index f47850a05c..f47850a05c 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index b35cc41dd4..b35cc41dd4 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index dc5759a13d..dc5759a13d 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index abe00bac5b..abe00bac5b 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index 1d3e71dfcb..1d3e71dfcb 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6c167a6b31..6c167a6b31 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
index fc45baa16d..fc45baa16d 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/java/sca-contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
index 3778bd4c50..3778bd4c50 100644
--- a/java/sca-contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
diff --git a/java/sca-contrib/modules/implementation-xquery/LICENSE b/sca-java-2.x/contrib/modules/implementation-xquery/LICENSE
index d645695673..d645695673 100644
--- a/java/sca-contrib/modules/implementation-xquery/LICENSE
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/LICENSE
diff --git a/java/sca-contrib/modules/implementation-xquery/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/implementation-xquery/META-INF/MANIFEST.MF
index 380c00293e..380c00293e 100644
--- a/java/sca-contrib/modules/implementation-xquery/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/implementation-xquery/NOTICE b/sca-java-2.x/contrib/modules/implementation-xquery/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/implementation-xquery/NOTICE
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/NOTICE
diff --git a/java/sca-contrib/modules/implementation-xquery/pom.xml b/sca-java-2.x/contrib/modules/implementation-xquery/pom.xml
index 559c17e97d..559c17e97d 100644
--- a/java/sca-contrib/modules/implementation-xquery/pom.xml
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/pom.xml
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
index f5bc5dd9b8..f5bc5dd9b8 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
index bdfd390499..bdfd390499 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
index 63a3a49e13..63a3a49e13 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
index 57536e502b..57536e502b 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
index 0c628b3715..0c628b3715 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
index 2a9673068b..2a9673068b 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
index 5e77575c3c..5e77575c3c 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
index 77c8eea511..77c8eea511 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
index c8d19bf149..c8d19bf149 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
index 59ac68aa7d..59ac68aa7d 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a51995e56d..a51995e56d 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 7ccc08d1ee..7ccc08d1ee 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
index 33c605de27..33c605de27 100644
--- a/java/sca-contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
diff --git a/java/sca-contrib/modules/node-dynamic/LICENSE b/sca-java-2.x/contrib/modules/node-dynamic/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/node-dynamic/LICENSE
+++ b/sca-java-2.x/contrib/modules/node-dynamic/LICENSE
diff --git a/java/sca-contrib/modules/node-dynamic/NOTICE b/sca-java-2.x/contrib/modules/node-dynamic/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/node-dynamic/NOTICE
+++ b/sca-java-2.x/contrib/modules/node-dynamic/NOTICE
diff --git a/java/sca-contrib/modules/node-dynamic/pom.xml b/sca-java-2.x/contrib/modules/node-dynamic/pom.xml
index 91fbc9e025..91fbc9e025 100644
--- a/java/sca-contrib/modules/node-dynamic/pom.xml
+++ b/sca-java-2.x/contrib/modules/node-dynamic/pom.xml
diff --git a/java/sca-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java b/sca-java-2.x/contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
index af6155e500..af6155e500 100644
--- a/java/sca-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
+++ b/sca-java-2.x/contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
diff --git a/java/sca-contrib/modules/node-dynamic/src/main/resources/log4j.properties b/sca-java-2.x/contrib/modules/node-dynamic/src/main/resources/log4j.properties
index e5b3f8ebfb..e5b3f8ebfb 100644
--- a/java/sca-contrib/modules/node-dynamic/src/main/resources/log4j.properties
+++ b/sca-java-2.x/contrib/modules/node-dynamic/src/main/resources/log4j.properties
diff --git a/java/sca-contrib/modules/node-launcher-webapp/LICENSE b/sca-java-2.x/contrib/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/LICENSE
diff --git a/java/sca-contrib/modules/node-launcher-webapp/NOTICE b/sca-java-2.x/contrib/modules/node-launcher-webapp/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/NOTICE
diff --git a/java/sca-contrib/modules/node-launcher-webapp/pom.xml b/sca-java-2.x/contrib/modules/node-launcher-webapp/pom.xml
index cef83359a6..cef83359a6 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/pom.xml
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/java/sca-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-2.x/contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/java/sca-contrib/modules/node-manager/LICENSE b/sca-java-2.x/contrib/modules/node-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/node-manager/LICENSE
+++ b/sca-java-2.x/contrib/modules/node-manager/LICENSE
diff --git a/java/sca-contrib/modules/node-manager/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/node-manager/META-INF/MANIFEST.MF
index 55a65fb055..55a65fb055 100644
--- a/java/sca-contrib/modules/node-manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/node-manager/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/node-manager/NOTICE b/sca-java-2.x/contrib/modules/node-manager/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/node-manager/NOTICE
+++ b/sca-java-2.x/contrib/modules/node-manager/NOTICE
diff --git a/java/sca-contrib/modules/node-manager/pom.xml b/sca-java-2.x/contrib/modules/node-manager/pom.xml
index fa01090467..fa01090467 100644
--- a/java/sca-contrib/modules/node-manager/pom.xml
+++ b/sca-java-2.x/contrib/modules/node-manager/pom.xml
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
index 8dfae91314..8dfae91314 100644
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
+++ b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
index 340c6236fa..340c6236fa 100644
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
+++ b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
diff --git a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
index d23674ed4a..d23674ed4a 100644
--- a/java/sca-contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
+++ b/sca-java-2.x/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
diff --git a/java/sca-contrib/modules/node-manager/src/main/resources/NodeDaemon.composite b/sca-java-2.x/contrib/modules/node-manager/src/main/resources/NodeDaemon.composite
index cb587b02fd..cb587b02fd 100644
--- a/java/sca-contrib/modules/node-manager/src/main/resources/NodeDaemon.composite
+++ b/sca-java-2.x/contrib/modules/node-manager/src/main/resources/NodeDaemon.composite
diff --git a/java/sca-contrib/modules/policy-logging/LICENSE b/sca-java-2.x/contrib/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/policy-logging/LICENSE
+++ b/sca-java-2.x/contrib/modules/policy-logging/LICENSE
diff --git a/java/sca-contrib/modules/policy-logging/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/policy-logging/META-INF/MANIFEST.MF
index df410e306f..df410e306f 100644
--- a/java/sca-contrib/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/policy-logging/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/policy-logging/NOTICE b/sca-java-2.x/contrib/modules/policy-logging/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/policy-logging/NOTICE
+++ b/sca-java-2.x/contrib/modules/policy-logging/NOTICE
diff --git a/java/sca-contrib/modules/policy-logging/pom.xml b/sca-java-2.x/contrib/modules/policy-logging/pom.xml
index 218458c9fb..218458c9fb 100644
--- a/java/sca-contrib/modules/policy-logging/pom.xml
+++ b/sca-java-2.x/contrib/modules/policy-logging/pom.xml
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 836631541d..836631541d 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index c53c37ccf6..c53c37ccf6 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index b9ae619d11..b9ae619d11 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index 9a21f1e559..9a21f1e559 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 5fd7a37a26..5fd7a37a26 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 9bbae8956f..9bbae8956f 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index feddc8c056..feddc8c056 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 472f76c680..472f76c680 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..f56f96e4b9 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index e14c657d80..e14c657d80 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca-contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 956a8983a2..956a8983a2 100644
--- a/java/sca-contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/java/sca-contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-2.x/contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index d5b1b9eedc..d5b1b9eedc 100644
--- a/java/sca-contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/java/sca-contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-2.x/contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index fabb554236..fabb554236 100644
--- a/java/sca-contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-2.x/contrib/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/java/sca-contrib/modules/policy-reliability/LICENSE b/sca-java-2.x/contrib/modules/policy-reliability/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/policy-reliability/LICENSE
+++ b/sca-java-2.x/contrib/modules/policy-reliability/LICENSE
diff --git a/java/sca-contrib/modules/policy-reliability/NOTICE b/sca-java-2.x/contrib/modules/policy-reliability/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/policy-reliability/NOTICE
+++ b/sca-java-2.x/contrib/modules/policy-reliability/NOTICE
diff --git a/java/sca-contrib/modules/policy-reliability/pom.xml b/sca-java-2.x/contrib/modules/policy-reliability/pom.xml
index b1cf5a48bb..b1cf5a48bb 100644
--- a/java/sca-contrib/modules/policy-reliability/pom.xml
+++ b/sca-java-2.x/contrib/modules/policy-reliability/pom.xml
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java b/sca-java-2.x/contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
index 60e28f5231..60e28f5231 100644
--- a/java/sca-contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-2.x/contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 7f616cb3d4..7f616cb3d4 100644
--- a/java/sca-contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-2.x/contrib/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/java/sca-contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml b/sca-java-2.x/contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
index df87906ab8..df87906ab8 100644
--- a/java/sca-contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
+++ b/sca-java-2.x/contrib/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
diff --git a/java/sca-contrib/modules/policy-security-jsr250/LICENSE b/sca-java-2.x/contrib/modules/policy-security-jsr250/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/LICENSE
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/LICENSE
diff --git a/java/sca-contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF
index a8d8f4fe9a..a8d8f4fe9a 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/policy-security-jsr250/NOTICE b/sca-java-2.x/contrib/modules/policy-security-jsr250/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/NOTICE
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/NOTICE
diff --git a/java/sca-contrib/modules/policy-security-jsr250/pom.xml b/sca-java-2.x/contrib/modules/policy-security-jsr250/pom.xml
index ddd8e5e307..ddd8e5e307 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/pom.xml
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/pom.xml
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
index e6279f4811..e6279f4811 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/JSR250Activator.java
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
index 2622886075..2622886075 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/JSR250PolicyProcessor.java
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 5feb961dc2..5feb961dc2 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
index 14454a1466..14454a1466 100644
--- a/java/sca-contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
+++ b/sca-java-2.x/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
diff --git a/java/sca-contrib/modules/policy-transaction/LICENSE b/sca-java-2.x/contrib/modules/policy-transaction/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/policy-transaction/LICENSE
+++ b/sca-java-2.x/contrib/modules/policy-transaction/LICENSE
diff --git a/java/sca-contrib/modules/policy-transaction/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/policy-transaction/META-INF/MANIFEST.MF
index 7a81ed85eb..7a81ed85eb 100644
--- a/java/sca-contrib/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/policy-transaction/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/policy-transaction/NOTICE b/sca-java-2.x/contrib/modules/policy-transaction/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/policy-transaction/NOTICE
+++ b/sca-java-2.x/contrib/modules/policy-transaction/NOTICE
diff --git a/java/sca-contrib/modules/policy-transaction/pom.xml b/sca-java-2.x/contrib/modules/policy-transaction/pom.xml
index 281219136b..281219136b 100644
--- a/java/sca-contrib/modules/policy-transaction/pom.xml
+++ b/sca-java-2.x/contrib/modules/policy-transaction/pom.xml
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
index 3c11fef865..3c11fef865 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index b3e90c23cd..b3e90c23cd 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index 3339f2e338..3339f2e338 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index 3a397e10d0..3a397e10d0 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
index 0dfa986177..0dfa986177 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f178876a72..f178876a72 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 831cd13914..831cd13914 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
index be97090378..be97090378 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
index 0795a4e5cf..0795a4e5cf 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
index 9f9088a380..9f9088a380 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d034e23a2..1d034e23a2 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index e9d9fab519..e9d9fab519 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index eeec814f60..eeec814f60 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index ff51b131b7..ff51b131b7 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
index 324fa03da6..324fa03da6 100644
--- a/java/sca-contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-2.x/contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index e8560d775d..e8560d775d 100644
--- a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-2.x/contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/java/sca-contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-2.x/contrib/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/LICENSE b/sca-java-2.x/contrib/modules/sca-api-osoa/LICENSE
index 617c69079b..617c69079b 100644
--- a/java/sca-contrib/modules/sca-api-osoa/LICENSE
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/LICENSE
diff --git a/java/sca-contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF
index 33c6857cf9..33c6857cf9 100644
--- a/java/sca-contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/sca-api-osoa/NOTICE b/sca-java-2.x/contrib/modules/sca-api-osoa/NOTICE
index 4fe77f0e58..4fe77f0e58 100644
--- a/java/sca-contrib/modules/sca-api-osoa/NOTICE
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/NOTICE
diff --git a/java/sca-contrib/modules/sca-api-osoa/pom.xml b/sca-java-2.x/contrib/modules/sca-api-osoa/pom.xml
index 709c5e642d..709c5e642d 100644
--- a/java/sca-contrib/modules/sca-api-osoa/pom.xml
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/pom.xml
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
index 578df9e017..578df9e017 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java
index 7f6756bcbd..7f6756bcbd 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java
index 52290a4bba..52290a4bba 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Constants.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java
index 12733a7bd2..12733a7bd2 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/Conversation.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java
index 2e3b71fd1c..2e3b71fd1c 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 0a0c2afff9..0a0c2afff9 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java
index cdcfa9a791..cdcfa9a791 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java
index 8da6bcd1f3..8da6bcd1f3 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 70f5f904a4..70f5f904a4 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index dd6b1c3242..dd6b1c3242 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index 556dd4e68e..556dd4e68e 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java
index f7fca41212..f7fca41212 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java
index 0ee613fdcb..0ee613fdcb 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java
index bc73d22c9d..bc73d22c9d 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index 25ade6f091..25ade6f091 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java
index bc09c8ccdd..bc09c8ccdd 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java
index baacb2f520..baacb2f520 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index e9fcfee2d3..e9fcfee2d3 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java
index b2f6f17129..b2f6f17129 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java
index f0350f8ff5..f0350f8ff5 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java
index d65558653b..d65558653b 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java
index 21bf986705..21bf986705 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index c65ff5838f..c65ff5838f 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java
index d610e21d64..d610e21d64 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java
index a8cf28475b..a8cf28475b 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java
index fc925aa402..fc925aa402 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java
index eaf9e3207c..eaf9e3207c 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java
index b22a6a840c..b22a6a840c 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java
index 71af35634d..71af35634d 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java
index 44388bea74..44388bea74 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java
index 4d71b3f357..4d71b3f357 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java
index 53d58b7dc1..53d58b7dc1 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java
index 3af699de07..3af699de07 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java
index cd88df1128..cd88df1128 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java
index 62f4abdbee..62f4abdbee 100644
--- a/java/sca-contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-2.x/contrib/modules/sca-api-osoa/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/java/sca-contrib/modules/tracing-aspectj/LICENSE b/sca-java-2.x/contrib/modules/tracing-aspectj/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/modules/tracing-aspectj/LICENSE
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/LICENSE
diff --git a/java/sca-contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF
index 5a415a3fe4..5a415a3fe4 100644
--- a/java/sca-contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/tracing-aspectj/NOTICE b/sca-java-2.x/contrib/modules/tracing-aspectj/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/modules/tracing-aspectj/NOTICE
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/NOTICE
diff --git a/java/sca-contrib/modules/tracing-aspectj/launcher.bat b/sca-java-2.x/contrib/modules/tracing-aspectj/launcher.bat
index a5305f486d..a5305f486d 100644
--- a/java/sca-contrib/modules/tracing-aspectj/launcher.bat
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/launcher.bat
diff --git a/java/sca-contrib/modules/tracing-aspectj/pom.xml b/sca-java-2.x/contrib/modules/tracing-aspectj/pom.xml
index d96d1ef8d6..d96d1ef8d6 100644
--- a/java/sca-contrib/modules/tracing-aspectj/pom.xml
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/pom.xml
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
index 630bcb285b..630bcb285b 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
index 965cfa5b5d..965cfa5b5d 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
index 262742e867..262742e867 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
index 0178ebdb6e..0178ebdb6e 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
index f699a140e3..f699a140e3 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
diff --git a/java/sca-contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sca-java-2.x/contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
index 7b76faaf36..7b76faaf36 100644
--- a/java/sca-contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
+++ b/sca-java-2.x/contrib/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
diff --git a/java/sca-contrib/modules/workspace-impl/LICENSE b/sca-java-2.x/contrib/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/workspace-impl/LICENSE
+++ b/sca-java-2.x/contrib/modules/workspace-impl/LICENSE
diff --git a/java/sca-contrib/modules/workspace-impl/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/workspace-impl/META-INF/MANIFEST.MF
index dea3b120cf..dea3b120cf 100644
--- a/java/sca-contrib/modules/workspace-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/workspace-impl/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/workspace-impl/NOTICE b/sca-java-2.x/contrib/modules/workspace-impl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/workspace-impl/NOTICE
+++ b/sca-java-2.x/contrib/modules/workspace-impl/NOTICE
diff --git a/java/sca-contrib/modules/workspace-impl/pom.xml b/sca-java-2.x/contrib/modules/workspace-impl/pom.xml
index 9dc538688b..9dc538688b 100644
--- a/java/sca-contrib/modules/workspace-impl/pom.xml
+++ b/sca-java-2.x/contrib/modules/workspace-impl/pom.xml
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-2.x/contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index bdfd244293..bdfd244293 100644
--- a/java/sca-contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-2.x/contrib/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
index 379d0a017e..379d0a017e 100644
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
+++ b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilder
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
diff --git a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
index 2e8326c062..2e8326c062 100644
--- a/java/sca-contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
+++ b/sca-java-2.x/contrib/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
diff --git a/java/sca-contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-2.x/contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index be64c65c45..be64c65c45 100644
--- a/java/sca-contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-2.x/contrib/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/java/sca-contrib/modules/workspace/LICENSE b/sca-java-2.x/contrib/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/modules/workspace/LICENSE
+++ b/sca-java-2.x/contrib/modules/workspace/LICENSE
diff --git a/java/sca-contrib/modules/workspace/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/modules/workspace/META-INF/MANIFEST.MF
index f37441dbdd..f37441dbdd 100644
--- a/java/sca-contrib/modules/workspace/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/modules/workspace/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/modules/workspace/NOTICE b/sca-java-2.x/contrib/modules/workspace/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/modules/workspace/NOTICE
+++ b/sca-java-2.x/contrib/modules/workspace/NOTICE
diff --git a/java/sca-contrib/modules/workspace/pom.xml b/sca-java-2.x/contrib/modules/workspace/pom.xml
index fc628481e8..fc628481e8 100644
--- a/java/sca-contrib/modules/workspace/pom.xml
+++ b/sca-java-2.x/contrib/modules/workspace/pom.xml
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 66f38afec7..66f38afec7 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
index b7c11f769b..b7c11f769b 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilder.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
index 10c18def10..10c18def10 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderException.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
index 8200321eec..8200321eec 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionBuilderExtensionPoint.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
index c94601be67..c94601be67 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index 7674c13627..7674c13627 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index 62e05d29fc..62e05d29fc 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index 33ac7aa342..33ac7aa342 100644
--- a/java/sca-contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 86a302a103..86a302a103 100644
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
index 98ad0b72b0..98ad0b72b0 100644
--- a/java/sca-contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint
diff --git a/java/sca-contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties b/sca-java-2.x/contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties
index f83db411bf..f83db411bf 100644
--- a/java/sca-contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties
+++ b/sca-java-2.x/contrib/modules/workspace/src/main/resources/workspace-xml-validation-messages.properties
diff --git a/java/sca-contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-2.x/contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
index 19924da859..19924da859 100644
--- a/java/sca-contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-2.x/contrib/modules/workspace/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/README b/sca-java-2.x/contrib/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/java/sca-contrib/samples/binding-echo-extension/README
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/README
diff --git a/java/sca-contrib/samples/binding-echo-extension/build.xml b/sca-java-2.x/contrib/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/java/sca-contrib/samples/binding-echo-extension/build.xml
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/build.xml
diff --git a/java/sca-contrib/samples/binding-echo-extension/pom.xml b/sca-java-2.x/contrib/samples/binding-echo-extension/pom.xml
index 5d5ba0865f..5d5ba0865f 100644
--- a/java/sca-contrib/samples/binding-echo-extension/pom.xml
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/pom.xml
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 45fdb73f67..45fdb73f67 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 4877bade7f..4877bade7f 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index c847d088a6..c847d088a6 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 72b8002238..72b8002238 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index fcb250b444..fcb250b444 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index 01b89101a8..01b89101a8 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
index 1cb1d1c9ba..1cb1d1c9ba 100644
--- a/java/sca-contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/java/sca-contrib/samples/binding-echo/README b/sca-java-2.x/contrib/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/java/sca-contrib/samples/binding-echo/README
+++ b/sca-java-2.x/contrib/samples/binding-echo/README
diff --git a/java/sca-contrib/samples/binding-echo/binding-echo.png b/sca-java-2.x/contrib/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/java/sca-contrib/samples/binding-echo/binding-echo.png
+++ b/sca-java-2.x/contrib/samples/binding-echo/binding-echo.png
diff --git a/java/sca-contrib/samples/binding-echo/binding-echo.svg b/sca-java-2.x/contrib/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/java/sca-contrib/samples/binding-echo/binding-echo.svg
+++ b/sca-java-2.x/contrib/samples/binding-echo/binding-echo.svg
diff --git a/java/sca-contrib/samples/binding-echo/build.xml b/sca-java-2.x/contrib/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/java/sca-contrib/samples/binding-echo/build.xml
+++ b/sca-java-2.x/contrib/samples/binding-echo/build.xml
diff --git a/java/sca-contrib/samples/binding-echo/pom.xml b/sca-java-2.x/contrib/samples/binding-echo/pom.xml
index f5e2464563..f5e2464563 100644
--- a/java/sca-contrib/samples/binding-echo/pom.xml
+++ b/sca-java-2.x/contrib/samples/binding-echo/pom.xml
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index 01b89101a8..01b89101a8 100644
--- a/java/sca-contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/java/sca-contrib/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-2.x/contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/java/sca-contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-2.x/contrib/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/java/sca-contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-2.x/contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/java/sca-contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-2.x/contrib/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/README b/sca-java-2.x/contrib/samples/binding-notification-broker/README
index ebd8bbec30..ebd8bbec30 100644
--- a/java/sca-contrib/samples/binding-notification-broker/README
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/README
diff --git a/java/sca-contrib/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-2.x/contrib/samples/binding-notification-broker/binding-notification-broker.png
index 49030650f2..49030650f2 100644
--- a/java/sca-contrib/samples/binding-notification-broker/binding-notification-broker.png
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/java/sca-contrib/samples/binding-notification-broker/build.xml b/sca-java-2.x/contrib/samples/binding-notification-broker/build.xml
index a042b9036a..a042b9036a 100644
--- a/java/sca-contrib/samples/binding-notification-broker/build.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/build.xml
diff --git a/java/sca-contrib/samples/binding-notification-broker/pom.xml b/sca-java-2.x/contrib/samples/binding-notification-broker/pom.xml
index 82e79c24f5..82e79c24f5 100644
--- a/java/sca-contrib/samples/binding-notification-broker/pom.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/pom.xml
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
index 35fa1a9ee9..35fa1a9ee9 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
index 3f069ede78..3f069ede78 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
index b9a5b98126..b9a5b98126 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
index 6406572d10..6406572d10 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
index b0f0d2a800..b0f0d2a800 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
index f490c34ea6..f490c34ea6 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca-contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-2.x/contrib/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca-contrib/samples/binding-notification-consumer/README b/sca-java-2.x/contrib/samples/binding-notification-consumer/README
index b54b445670..b54b445670 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/README
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/README
diff --git a/java/sca-contrib/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-2.x/contrib/samples/binding-notification-consumer/binding-notification-consumer.png
index 33e1966c3e..33e1966c3e 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/binding-notification-consumer.png
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/java/sca-contrib/samples/binding-notification-consumer/build.xml b/sca-java-2.x/contrib/samples/binding-notification-consumer/build.xml
index f57fe1bb26..f57fe1bb26 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/build.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/build.xml
diff --git a/java/sca-contrib/samples/binding-notification-consumer/pom.xml b/sca-java-2.x/contrib/samples/binding-notification-consumer/pom.xml
index c1452f7d02..c1452f7d02 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/pom.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/pom.xml
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
index 424728692f..424728692f 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
index 852ddaa919..852ddaa919 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
index c53adb1944..c53adb1944 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
index 8f9bcc4438..8f9bcc4438 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca-contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
index c5318f405c..c5318f405c 100644
--- a/java/sca-contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/java/sca-contrib/samples/binding-notification-producer/README b/sca-java-2.x/contrib/samples/binding-notification-producer/README
index c5f284d4c5..c5f284d4c5 100644
--- a/java/sca-contrib/samples/binding-notification-producer/README
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/README
diff --git a/java/sca-contrib/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-2.x/contrib/samples/binding-notification-producer/binding-notification-producer.png
index 34c347c893..34c347c893 100644
--- a/java/sca-contrib/samples/binding-notification-producer/binding-notification-producer.png
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/java/sca-contrib/samples/binding-notification-producer/build.xml b/sca-java-2.x/contrib/samples/binding-notification-producer/build.xml
index d13e4c8a6c..d13e4c8a6c 100644
--- a/java/sca-contrib/samples/binding-notification-producer/build.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/build.xml
diff --git a/java/sca-contrib/samples/binding-notification-producer/pom.xml b/sca-java-2.x/contrib/samples/binding-notification-producer/pom.xml
index ffe90c0cb3..ffe90c0cb3 100644
--- a/java/sca-contrib/samples/binding-notification-producer/pom.xml
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/pom.xml
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
index be80e71249..be80e71249 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
index 548d45b12d..548d45b12d 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
index e670ccb95c..e670ccb95c 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
index efd3657dc3..efd3657dc3 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
index 2dc70f8ed1..2dc70f8ed1 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
index 2db6ea655b..2db6ea655b 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
index b823bbebcc..b823bbebcc 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/java/sca-contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-2.x/contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
index d3901ee407..d3901ee407 100644
--- a/java/sca-contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ b/sca-java-2.x/contrib/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/README b/sca-java-2.x/contrib/samples/calculator-corba-reference/README
index 66c4cddb94..66c4cddb94 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/README
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/README
diff --git a/java/sca-contrib/samples/calculator-corba-reference/pom.xml b/sca-java-2.x/contrib/samples/calculator-corba-reference/pom.xml
index 96d4ce402c..96d4ce402c 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/pom.xml
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
index 0bac3da45c..0bac3da45c 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
index 717add91a8..717add91a8 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
index 041608273b..041608273b 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
index 65e9b89ce2..65e9b89ce2 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
index 6206e0cf6f..6206e0cf6f 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index 6facda6a34..6facda6a34 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
index f6a4bd8994..f6a4bd8994 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
diff --git a/java/sca-contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
index 55ffeac8a3..55ffeac8a3 100644
--- a/java/sca-contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
+++ b/sca-java-2.x/contrib/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
diff --git a/java/sca-contrib/samples/calculator-corba-service/README b/sca-java-2.x/contrib/samples/calculator-corba-service/README
index 87863752cd..87863752cd 100644
--- a/java/sca-contrib/samples/calculator-corba-service/README
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/README
diff --git a/java/sca-contrib/samples/calculator-corba-service/pom.xml b/sca-java-2.x/contrib/samples/calculator-corba-service/pom.xml
index 63c5f5f9a6..63c5f5f9a6 100644
--- a/java/sca-contrib/samples/calculator-corba-service/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/pom.xml
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
index b0a46b6dd0..b0a46b6dd0 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
index 675350860e..675350860e 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
index 1ab6cecef7..1ab6cecef7 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
index 4248ca8573..4248ca8573 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
index 6576358755..6576358755 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
index 0977982fb3..0977982fb3 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
index 0cf6439d49..0cf6439d49 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
index 3e2956d469..3e2956d469 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
index ad193ee121..ad193ee121 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
diff --git a/java/sca-contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
index 5848bbaa2c..5848bbaa2c 100644
--- a/java/sca-contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
+++ b/sca-java-2.x/contrib/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
diff --git a/java/sca-contrib/samples/calculator-distributed/README b/sca-java-2.x/contrib/samples/calculator-distributed/README
index 51f4b07e81..51f4b07e81 100644
--- a/java/sca-contrib/samples/calculator-distributed/README
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/README
diff --git a/java/sca-contrib/samples/calculator-distributed/build.xml b/sca-java-2.x/contrib/samples/calculator-distributed/build.xml
index cccd22f3ae..cccd22f3ae 100644
--- a/java/sca-contrib/samples/calculator-distributed/build.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/build.xml
diff --git a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.png b/sca-java-2.x/contrib/samples/calculator-distributed/calculator-distributed.png
index 7c0e175664..7c0e175664 100644
--- a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.png
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/calculator-distributed.png
diff --git a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.svg b/sca-java-2.x/contrib/samples/calculator-distributed/calculator-distributed.svg
index be5a4b8185..be5a4b8185 100644
--- a/java/sca-contrib/samples/calculator-distributed/calculator-distributed.svg
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/calculator-distributed.svg
diff --git a/java/sca-contrib/samples/calculator-distributed/cloud.composite b/sca-java-2.x/contrib/samples/calculator-distributed/cloud.composite
index 85e2f9c7f3..85e2f9c7f3 100644
--- a/java/sca-contrib/samples/calculator-distributed/cloud.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/cloud.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/domain.composite b/sca-java-2.x/contrib/samples/calculator-distributed/domain.composite
index 643e22d0cf..643e22d0cf 100644
--- a/java/sca-contrib/samples/calculator-distributed/domain.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/domain.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/pom.xml b/sca-java-2.x/contrib/samples/calculator-distributed/pom.xml
index e1e86d8896..e1e86d8896 100644
--- a/java/sca-contrib/samples/calculator-distributed/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/pom.xml
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
index c927500cc7..c927500cc7 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
index f03b9b94d4..f03b9b94d4 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 87021505b3..87021505b3 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
index 50600eaedc..50600eaedc 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
index 95d8934665..95d8934665 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
index 8b4fe566a1..8b4fe566a1 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
index ed7fe55abc..ed7fe55abc 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
index 8f29cc17aa..8f29cc17aa 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
index 9ad132b0d4..9ad132b0d4 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
index 172676a3c7..172676a3c7 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
index b770dbe8d4..b770dbe8d4 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 6c0ffe4ac0..6c0ffe4ac0 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
index 66caf0d17b..66caf0d17b 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-2.x/contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 2a6f3af002..2a6f3af002 100644
--- a/java/sca-contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/java/sca-contrib/samples/calculator-distributed/workspace.xml b/sca-java-2.x/contrib/samples/calculator-distributed/workspace.xml
index 7d6d3dbdbd..7d6d3dbdbd 100644
--- a/java/sca-contrib/samples/calculator-distributed/workspace.xml
+++ b/sca-java-2.x/contrib/samples/calculator-distributed/workspace.xml
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/README b/sca-java-2.x/contrib/samples/calculator-implementation-policies/README
index bd66eee1c9..bd66eee1c9 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/README
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/README
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/build.xml b/sca-java-2.x/contrib/samples/calculator-implementation-policies/build.xml
index 7afa23a07f..7afa23a07f 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/build.xml
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/calculator.png b/sca-java-2.x/contrib/samples/calculator-implementation-policies/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/calculator.png
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/calculator.png
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/calculator.svg b/sca-java-2.x/contrib/samples/calculator-implementation-policies/calculator.svg
index af34f07e04..af34f07e04 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/calculator.svg
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/calculator.svg
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/pom.xml b/sca-java-2.x/contrib/samples/calculator-implementation-policies/pom.xml
index 7bc0be2dca..7bc0be2dca 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/pom.xml
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
index caf4d358df..caf4d358df 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
index 2bce187049..2bce187049 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
index d3fa7a8f41..d3fa7a8f41 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
index d91bf88d96..d91bf88d96 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
index 6cccde0d13..6cccde0d13 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
index 157570c3df..157570c3df 100644
--- a/java/sca-contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca-contrib/samples/calculator-lean/README b/sca-java-2.x/contrib/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/java/sca-contrib/samples/calculator-lean/README
+++ b/sca-java-2.x/contrib/samples/calculator-lean/README
diff --git a/java/sca-contrib/samples/calculator-lean/calculator.png b/sca-java-2.x/contrib/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca-contrib/samples/calculator-lean/calculator.png
+++ b/sca-java-2.x/contrib/samples/calculator-lean/calculator.png
diff --git a/java/sca-contrib/samples/calculator-lean/calculator.svg b/sca-java-2.x/contrib/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/java/sca-contrib/samples/calculator-lean/calculator.svg
+++ b/sca-java-2.x/contrib/samples/calculator-lean/calculator.svg
diff --git a/java/sca-contrib/samples/calculator-lean/pom.xml b/sca-java-2.x/contrib/samples/calculator-lean/pom.xml
index a68887b9b5..a68887b9b5 100644
--- a/java/sca-contrib/samples/calculator-lean/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-lean/pom.xml
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index d56aa86e09..d56aa86e09 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-2.x/contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/java/sca-contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/java/sca-contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index 94dc747734..94dc747734 100644
--- a/java/sca-contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca-contrib/samples/calculator-rcp/build.properties b/sca-java-2.x/contrib/samples/calculator-rcp/build.properties
index 0530eb648b..0530eb648b 100644
--- a/java/sca-contrib/samples/calculator-rcp/build.properties
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/build.properties
diff --git a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_16.gif b/sca-java-2.x/contrib/samples/calculator-rcp/icons/alt_window_16.gif
index 05626b17d8..05626b17d8 100644
--- a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_16.gif
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/icons/alt_window_16.gif
diff --git a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_32.gif b/sca-java-2.x/contrib/samples/calculator-rcp/icons/alt_window_32.gif
index b432f88339..b432f88339 100644
--- a/java/sca-contrib/samples/calculator-rcp/icons/alt_window_32.gif
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/icons/alt_window_32.gif
diff --git a/java/sca-contrib/samples/calculator-rcp/plugin.xml b/sca-java-2.x/contrib/samples/calculator-rcp/plugin.xml
index 1fb5acd9b5..1fb5acd9b5 100644
--- a/java/sca-contrib/samples/calculator-rcp/plugin.xml
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/plugin.xml
diff --git a/java/sca-contrib/samples/calculator-rcp/pom.xml b/sca-java-2.x/contrib/samples/calculator-rcp/pom.xml
index 0e5214cdd0..0e5214cdd0 100644
--- a/java/sca-contrib/samples/calculator-rcp/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/pom.xml
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 50f68dcb01..50f68dcb01 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
index 5ce6522fed..5ce6522fed 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Application.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
index 2fccfb2d77..2fccfb2d77 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationActionBarAdvisor.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
index ac1893509c..ac1893509c 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchAdvisor.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
index 6378decf20..6378decf20 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/ApplicationWorkbenchWindowAdvisor.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
index 445b4b65b2..445b4b65b2 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/Perspective.java
diff --git a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
index f95c1e029c..f95c1e029c 100644
--- a/java/sca-contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
+++ b/sca-java-2.x/contrib/samples/calculator-rcp/src/main/java/calculator/rcp/View.java
diff --git a/java/sca-contrib/samples/calculator-script/README b/sca-java-2.x/contrib/samples/calculator-script/README
index ab1dda13df..ab1dda13df 100644
--- a/java/sca-contrib/samples/calculator-script/README
+++ b/sca-java-2.x/contrib/samples/calculator-script/README
diff --git a/java/sca-contrib/samples/calculator-script/build.xml b/sca-java-2.x/contrib/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/java/sca-contrib/samples/calculator-script/build.xml
+++ b/sca-java-2.x/contrib/samples/calculator-script/build.xml
diff --git a/java/sca-contrib/samples/calculator-script/calculator-script.png b/sca-java-2.x/contrib/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/java/sca-contrib/samples/calculator-script/calculator-script.png
+++ b/sca-java-2.x/contrib/samples/calculator-script/calculator-script.png
diff --git a/java/sca-contrib/samples/calculator-script/calculator-script.svg b/sca-java-2.x/contrib/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/java/sca-contrib/samples/calculator-script/calculator-script.svg
+++ b/sca-java-2.x/contrib/samples/calculator-script/calculator-script.svg
diff --git a/java/sca-contrib/samples/calculator-script/pom.xml b/sca-java-2.x/contrib/samples/calculator-script/pom.xml
index 4ed19c0751..4ed19c0751 100644
--- a/java/sca-contrib/samples/calculator-script/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-script/pom.xml
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/Calculator.composite
index 8a765e6153..8a765e6153 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/java/sca-contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/java/sca-contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index fea8f62110..fea8f62110 100644
--- a/java/sca-contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca-contrib/samples/calculator-webapp/README b/sca-java-2.x/contrib/samples/calculator-webapp/README
index c88b92b206..c88b92b206 100644
--- a/java/sca-contrib/samples/calculator-webapp/README
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/README
diff --git a/java/sca-contrib/samples/calculator-webapp/calculator-web.png b/sca-java-2.x/contrib/samples/calculator-webapp/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/java/sca-contrib/samples/calculator-webapp/calculator-web.png
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/calculator-web.png
diff --git a/java/sca-contrib/samples/calculator-webapp/calculator-web.svg b/sca-java-2.x/contrib/samples/calculator-webapp/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/java/sca-contrib/samples/calculator-webapp/calculator-web.svg
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/calculator-web.svg
diff --git a/java/sca-contrib/samples/calculator-webapp/pom.xml b/sca-java-2.x/contrib/samples/calculator-webapp/pom.xml
index d2152897dc..d2152897dc 100644
--- a/java/sca-contrib/samples/calculator-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/pom.xml
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 57d39cd8d8..57d39cd8d8 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
index 50c23af0b2..50c23af0b2 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
index b5a828d55b..b5a828d55b 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
index 4bc5c984dd..4bc5c984dd 100644
--- a/java/sca-contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/contrib/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/README b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/README
index d0d3307b3a..d0d3307b3a 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/README
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/README
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.png
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/pom.xml
index c6d24f4806..c6d24f4806 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
index c79c7b0395..c79c7b0395 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
index 8f6af2f224..8f6af2f224 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
index 9625c0d692..9625c0d692 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
index 23a62680c5..23a62680c5 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
index 4d511f887e..4d511f887e 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 858e87a34f..858e87a34f 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
index b6b244244b..b6b244244b 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
index 4611669bbd..4611669bbd 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
index 8ef9928018..8ef9928018 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index d5c02e354d..d5c02e354d 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca-contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/contrib/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/README b/sca-java-2.x/contrib/samples/calculator-ws-webapp/README
index a6e6c897e4..a6e6c897e4 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/README
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/README
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.png b/sca-java-2.x/contrib/samples/calculator-ws-webapp/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.png
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/calculator-web.png
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-2.x/contrib/samples/calculator-ws-webapp/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/calculator-web.svg
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/pom.xml b/sca-java-2.x/contrib/samples/calculator-ws-webapp/pom.xml
index e0543d94a8..e0543d94a8 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/pom.xml
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
index c7e6383559..c7e6383559 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
index 0af6d681ce..0af6d681ce 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
index 0f03d6e7a1..0f03d6e7a1 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
index 6415d5a896..6415d5a896 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
index fe09ab2e1b..fe09ab2e1b 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 59bbb0de83..59bbb0de83 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
index d3a62d39f4..d3a62d39f4 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca-contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/contrib/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/java/sca-contrib/samples/calculator2/README b/sca-java-2.x/contrib/samples/calculator2/README
index ceb532faed..ceb532faed 100644
--- a/java/sca-contrib/samples/calculator2/README
+++ b/sca-java-2.x/contrib/samples/calculator2/README
diff --git a/java/sca-contrib/samples/calculator2/build.xml b/sca-java-2.x/contrib/samples/calculator2/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/java/sca-contrib/samples/calculator2/build.xml
+++ b/sca-java-2.x/contrib/samples/calculator2/build.xml
diff --git a/java/sca-contrib/samples/calculator2/calculator.png b/sca-java-2.x/contrib/samples/calculator2/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/java/sca-contrib/samples/calculator2/calculator.png
+++ b/sca-java-2.x/contrib/samples/calculator2/calculator.png
diff --git a/java/sca-contrib/samples/calculator2/calculator.svg b/sca-java-2.x/contrib/samples/calculator2/calculator.svg
index 0615925c50..0615925c50 100644
--- a/java/sca-contrib/samples/calculator2/calculator.svg
+++ b/sca-java-2.x/contrib/samples/calculator2/calculator.svg
diff --git a/java/sca-contrib/samples/calculator2/pom.xml b/sca-java-2.x/contrib/samples/calculator2/pom.xml
index 1f95585cbe..1f95585cbe 100644
--- a/java/sca-contrib/samples/calculator2/pom.xml
+++ b/sca-java-2.x/contrib/samples/calculator2/pom.xml
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/calculator2/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/calculator2/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/java/sca-contrib/samples/calculator2/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/calculator2/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
index 775ad15537..775ad15537 100644
--- a/java/sca-contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/contrib/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java
diff --git a/java/sca-contrib/samples/callback-ws-client/README b/sca-java-2.x/contrib/samples/callback-ws-client/README
index 66121362c9..66121362c9 100644
--- a/java/sca-contrib/samples/callback-ws-client/README
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/README
diff --git a/java/sca-contrib/samples/callback-ws-client/build.xml b/sca-java-2.x/contrib/samples/callback-ws-client/build.xml
index 8698c6018d..8698c6018d 100644
--- a/java/sca-contrib/samples/callback-ws-client/build.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/build.xml
diff --git a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.png b/sca-java-2.x/contrib/samples/callback-ws-client/callback-ws-client.png
index 802ef604a7..802ef604a7 100644
--- a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.png
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/callback-ws-client.png
diff --git a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.svg b/sca-java-2.x/contrib/samples/callback-ws-client/callback-ws-client.svg
index f49aeadbbf..f49aeadbbf 100644
--- a/java/sca-contrib/samples/callback-ws-client/callback-ws-client.svg
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/callback-ws-client.svg
diff --git a/java/sca-contrib/samples/callback-ws-client/pom.xml b/sca-java-2.x/contrib/samples/callback-ws-client/pom.xml
index 4ac9e6cf81..4ac9e6cf81 100644
--- a/java/sca-contrib/samples/callback-ws-client/pom.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/pom.xml
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
index 329edbe1c8..329edbe1c8 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
index 4f3a3bb63b..4f3a3bb63b 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
index 9bc056318b..9bc056318b 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
index caef8fcc98..caef8fcc98 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
index 314747d548..314747d548 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/resources/myapp.composite
index 5b776d6df8..5b776d6df8 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/main/resources/myapp.composite
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/java/sca-contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-2.x/contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
index fb2f6952c4..fb2f6952c4 100644
--- a/java/sca-contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/java/sca-contrib/samples/callback-ws-service/README b/sca-java-2.x/contrib/samples/callback-ws-service/README
index 2c65f745a6..2c65f745a6 100644
--- a/java/sca-contrib/samples/callback-ws-service/README
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/README
diff --git a/java/sca-contrib/samples/callback-ws-service/build.xml b/sca-java-2.x/contrib/samples/callback-ws-service/build.xml
index c91dd88a8c..c91dd88a8c 100644
--- a/java/sca-contrib/samples/callback-ws-service/build.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/build.xml
diff --git a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.png b/sca-java-2.x/contrib/samples/callback-ws-service/callback-ws-service.png
index 772ac38431..772ac38431 100644
--- a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.png
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/callback-ws-service.png
diff --git a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.svg b/sca-java-2.x/contrib/samples/callback-ws-service/callback-ws-service.svg
index ff0a1d307b..ff0a1d307b 100644
--- a/java/sca-contrib/samples/callback-ws-service/callback-ws-service.svg
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/callback-ws-service.svg
diff --git a/java/sca-contrib/samples/callback-ws-service/pom.xml b/sca-java-2.x/contrib/samples/callback-ws-service/pom.xml
index e39b4480a7..e39b4480a7 100644
--- a/java/sca-contrib/samples/callback-ws-service/pom.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/pom.xml
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
index 75ef05bc48..75ef05bc48 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
index 9bc056318b..9bc056318b 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
index caef8fcc98..caef8fcc98 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
index 98833338f0..98833338f0 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
index 35f7f60c2e..35f7f60c2e 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
index a09e638896..a09e638896 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/java/sca-contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-2.x/contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
index e87667cc3e..e87667cc3e 100644
--- a/java/sca-contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/java/sca-contrib/samples/callbacks-jms/README b/sca-java-2.x/contrib/samples/callbacks-jms/README
index b5e130e2fc..b5e130e2fc 100644
--- a/java/sca-contrib/samples/callbacks-jms/README
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/README
diff --git a/java/sca-contrib/samples/callbacks-jms/build.xml b/sca-java-2.x/contrib/samples/callbacks-jms/build.xml
index 665feeca71..665feeca71 100644
--- a/java/sca-contrib/samples/callbacks-jms/build.xml
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/build.xml
diff --git a/java/sca-contrib/samples/callbacks-jms/pom.xml b/sca-java-2.x/contrib/samples/callbacks-jms/pom.xml
index d7bef36033..d7bef36033 100644
--- a/java/sca-contrib/samples/callbacks-jms/pom.xml
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/pom.xml
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
index 12533ff610..12533ff610 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
index 69f5751379..69f5751379 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
index 882bcf8479..882bcf8479 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
index d0161b1498..d0161b1498 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
index 757fe3ae41..757fe3ae41 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
index 9de7307391..9de7307391 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/resources/callbacks.composite b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
index 94dd29c45d..94dd29c45d 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/resources/callbacks.composite
diff --git a/java/sca-contrib/samples/callbacks-jms/src/main/resources/jndi.properties b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/resources/jndi.properties
index 698aeb1711..698aeb1711 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/main/resources/jndi.properties
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/main/resources/jndi.properties
diff --git a/java/sca-contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/sca-java-2.x/contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
index 967fc42c64..967fc42c64 100644
--- a/java/sca-contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
+++ b/sca-java-2.x/contrib/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
diff --git a/java/sca-contrib/samples/chat-webapp/README b/sca-java-2.x/contrib/samples/chat-webapp/README
index 09b9c6f6be..09b9c6f6be 100644
--- a/java/sca-contrib/samples/chat-webapp/README
+++ b/sca-java-2.x/contrib/samples/chat-webapp/README
diff --git a/java/sca-contrib/samples/chat-webapp/chat-webapp.png b/sca-java-2.x/contrib/samples/chat-webapp/chat-webapp.png
index fdf540d243..fdf540d243 100644
--- a/java/sca-contrib/samples/chat-webapp/chat-webapp.png
+++ b/sca-java-2.x/contrib/samples/chat-webapp/chat-webapp.png
diff --git a/java/sca-contrib/samples/chat-webapp/chat-webapp.svg b/sca-java-2.x/contrib/samples/chat-webapp/chat-webapp.svg
index b37c1dc590..b37c1dc590 100644
--- a/java/sca-contrib/samples/chat-webapp/chat-webapp.svg
+++ b/sca-java-2.x/contrib/samples/chat-webapp/chat-webapp.svg
diff --git a/java/sca-contrib/samples/chat-webapp/pom.xml b/sca-java-2.x/contrib/samples/chat-webapp/pom.xml
index 93fa269cf4..93fa269cf4 100644
--- a/java/sca-contrib/samples/chat-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/chat-webapp/pom.xml
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-2.x/contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
index bf34675b8a..bf34675b8a 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-2.x/contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
index f0725dd60c..f0725dd60c 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-2.x/contrib/samples/chat-webapp/src/main/resources/chat.composite
index c9ce95e2dc..c9ce95e2dc 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/resources/chat.composite
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
index 97d91fec56..97d91fec56 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/chat.html
index 7a449a906a..7a449a906a 100644
--- a/java/sca-contrib/samples/chat-webapp/src/main/webapp/chat.html
+++ b/sca-java-2.x/contrib/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/java/sca-contrib/samples/chat2-webapp/README b/sca-java-2.x/contrib/samples/chat2-webapp/README
index 0186006211..0186006211 100644
--- a/java/sca-contrib/samples/chat2-webapp/README
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/README
diff --git a/java/sca-contrib/samples/chat2-webapp/build.xml b/sca-java-2.x/contrib/samples/chat2-webapp/build.xml
index 2d3fc0c5f3..2d3fc0c5f3 100644
--- a/java/sca-contrib/samples/chat2-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/build.xml
diff --git a/java/sca-contrib/samples/chat2-webapp/pom.xml b/sca-java-2.x/contrib/samples/chat2-webapp/pom.xml
index e35891561b..e35891561b 100644
--- a/java/sca-contrib/samples/chat2-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/pom.xml
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
index 261eb12124..261eb12124 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
index a5aff8f316..a5aff8f316 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatService.java
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
index fd22fb70e8..fd22fb70e8 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/resources/chat.composite b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/resources/chat.composite
index 93a10d0fdf..93a10d0fdf 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/resources/chat.composite
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/resources/chat.composite
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 897849ff8d..897849ff8d 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
index 6919372e87..6919372e87 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/chat.html b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/chat.html
index a063e27f8e..a063e27f8e 100644
--- a/java/sca-contrib/samples/chat2-webapp/src/main/webapp/chat.html
+++ b/sca-java-2.x/contrib/samples/chat2-webapp/src/main/webapp/chat.html
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/README b/sca-java-2.x/contrib/samples/customer-dojo-webapp/README
index 9c1729123f..9c1729123f 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/README
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/README
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/build-dojo.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/build-dojo.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/build-dojo.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/build.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/build.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/customer.sql b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/customer.sql
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/customer.sql
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/pom.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/pom.xml
index 2474a561fb..2474a561fb 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/pom.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
index b3c965f1f7..b3c965f1f7 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
index 2bd49e2cf1..2bd49e2cf1 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
index d7f88b8dd4..d7f88b8dd4 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
index 5674dede06..5674dede06 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
index 8b8a413499..8b8a413499 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/resources/customer.composite
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 32f11ab9d0..32f11ab9d0 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index 3e72bf29a4..3e72bf29a4 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index d90b4a7d62..d90b4a7d62 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
index f7e864053e..f7e864053e 100644
--- a/java/sca-contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
+++ b/sca-java-2.x/contrib/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
diff --git a/java/sca-contrib/samples/customer-dojo/README b/sca-java-2.x/contrib/samples/customer-dojo/README
index 9c1729123f..9c1729123f 100644
--- a/java/sca-contrib/samples/customer-dojo/README
+++ b/sca-java-2.x/contrib/samples/customer-dojo/README
diff --git a/java/sca-contrib/samples/customer-dojo/build-dojo.xml b/sca-java-2.x/contrib/samples/customer-dojo/build-dojo.xml
index 8c6bd99484..8c6bd99484 100644
--- a/java/sca-contrib/samples/customer-dojo/build-dojo.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/build-dojo.xml
diff --git a/java/sca-contrib/samples/customer-dojo/build.xml b/sca-java-2.x/contrib/samples/customer-dojo/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca-contrib/samples/customer-dojo/build.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/build.xml
diff --git a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.png b/sca-java-2.x/contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
+++ b/sca-java-2.x/contrib/samples/customer-dojo/customer-dojo-jsonrpc.png
diff --git a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg b/sca-java-2.x/contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca-contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
+++ b/sca-java-2.x/contrib/samples/customer-dojo/customer-dojo-jsonrpc.svg
diff --git a/java/sca-contrib/samples/customer-dojo/customer.sql b/sca-java-2.x/contrib/samples/customer-dojo/customer.sql
index a3caf8e050..a3caf8e050 100644
--- a/java/sca-contrib/samples/customer-dojo/customer.sql
+++ b/sca-java-2.x/contrib/samples/customer-dojo/customer.sql
diff --git a/java/sca-contrib/samples/customer-dojo/pom.xml b/sca-java-2.x/contrib/samples/customer-dojo/pom.xml
index 5c64caaad4..5c64caaad4 100644
--- a/java/sca-contrib/samples/customer-dojo/pom.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/pom.xml
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/Customer.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/Customer.java
index 6d207ea2ef..6d207ea2ef 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/Customer.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
index 5ad39aad5c..5ad39aad5c 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
index c0a2f25f15..c0a2f25f15 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
index b3c965f1f7..b3c965f1f7 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerService.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
index 2bd49e2cf1..2bd49e2cf1 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/java/launch/Launch.java b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/launch/Launch.java
index a51ab605bc..a51ab605bc 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/java/launch/Launch.java
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
index 64be295302..64be295302 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/orm.xml
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
index 5add897279..5add897279 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
index 136326d1d3..136326d1d3 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/content/customer.html b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/content/customer.html
index dbc8aad9d0..dbc8aad9d0 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/content/customer.html
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/content/customer.html
diff --git a/java/sca-contrib/samples/customer-dojo/src/main/resources/customer.composite b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/customer.composite
index 4c370f2a9f..4c370f2a9f 100644
--- a/java/sca-contrib/samples/customer-dojo/src/main/resources/customer.composite
+++ b/sca-java-2.x/contrib/samples/customer-dojo/src/main/resources/customer.composite
diff --git a/java/sca-contrib/samples/databinding-echo/README b/sca-java-2.x/contrib/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/java/sca-contrib/samples/databinding-echo/README
+++ b/sca-java-2.x/contrib/samples/databinding-echo/README
diff --git a/java/sca-contrib/samples/databinding-echo/build.xml b/sca-java-2.x/contrib/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/java/sca-contrib/samples/databinding-echo/build.xml
+++ b/sca-java-2.x/contrib/samples/databinding-echo/build.xml
diff --git a/java/sca-contrib/samples/databinding-echo/databinding-echo.png b/sca-java-2.x/contrib/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/java/sca-contrib/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-2.x/contrib/samples/databinding-echo/databinding-echo.png
diff --git a/java/sca-contrib/samples/databinding-echo/databinding-echo.svg b/sca-java-2.x/contrib/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/java/sca-contrib/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-2.x/contrib/samples/databinding-echo/databinding-echo.svg
diff --git a/java/sca-contrib/samples/databinding-echo/pom.xml b/sca-java-2.x/contrib/samples/databinding-echo/pom.xml
index 3010c7e89e..3010c7e89e 100644
--- a/java/sca-contrib/samples/databinding-echo/pom.xml
+++ b/sca-java-2.x/contrib/samples/databinding-echo/pom.xml
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 29a5e5c9ad..29a5e5c9ad 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index e98cd55bcf..e98cd55bcf 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
index b47a9c1b85..b47a9c1b85 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 9fff3bb4b9..9fff3bb4b9 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index 61ed7951e4..61ed7951e4 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-2.x/contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 30b77a6152..30b77a6152 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/java/sca-contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-2.x/contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/java/sca-contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/java/sca-contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-2.x/contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/java/sca-contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-2.x/contrib/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/java/sca-contrib/samples/domain-management/README b/sca-java-2.x/contrib/samples/domain-management/README
index 6280a28028..6280a28028 100644
--- a/java/sca-contrib/samples/domain-management/README
+++ b/sca-java-2.x/contrib/samples/domain-management/README
diff --git a/java/sca-contrib/samples/domain-management/pom.xml b/sca-java-2.x/contrib/samples/domain-management/pom.xml
index a64e411922..a64e411922 100644
--- a/java/sca-contrib/samples/domain-management/pom.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/pom.xml
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
index 28eede693d..28eede693d 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
index def0a1894f..def0a1894f 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/DistributeComponents.java
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListComponents.java
index 27cb31d57f..27cb31d57f 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListComponents.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListComponents.java
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
index 1bf8124682..1bf8124682 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListDependencies.java
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
index f5f0b9c655..f5f0b9c655 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/ListDeployables.java
diff --git a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/WireComponents.java
index d24d5c67c9..d24d5c67c9 100644
--- a/java/sca-contrib/samples/domain-management/src/main/java/manager/WireComponents.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/main/java/manager/WireComponents.java
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Cart.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/Cart.java
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/Item.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/Item.java
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
index f053ec9f48..f053ec9f48 100644
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
diff --git a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
index 9ef59df7a8..9ef59df7a8 100644
--- a/java/sca-contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/assets.xml
index 10693a89e6..10693a89e6 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/assets.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/assets.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/client.xml
index 5b34693bee..5b34693bee 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/client.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/client.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/store.xml
index d19b7eb161..d19b7eb161 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assembly/store.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assembly/store.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
index 33fe814c3a..33fe814c3a 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
index 14e1cdb672..14e1cdb672 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/client/client.composite
index 1279b319c4..1279b319c4 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/client/client.composite
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/client/client.composite
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
index 52348106f2..52348106f2 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/store/store.composite
index d4f18771d8..d4f18771d8 100644
--- a/java/sca-contrib/samples/domain-management/src/test/resources/store/store.composite
+++ b/sca-java-2.x/contrib/samples/domain-management/src/test/resources/store/store.composite
diff --git a/java/sca-contrib/samples/domain-webapp/README b/sca-java-2.x/contrib/samples/domain-webapp/README
index c01a0dd39a..c01a0dd39a 100644
--- a/java/sca-contrib/samples/domain-webapp/README
+++ b/sca-java-2.x/contrib/samples/domain-webapp/README
diff --git a/java/sca-contrib/samples/domain-webapp/build.xml b/sca-java-2.x/contrib/samples/domain-webapp/build.xml
index e008e3c9f0..e008e3c9f0 100644
--- a/java/sca-contrib/samples/domain-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/domain-webapp/build.xml
diff --git a/java/sca-contrib/samples/domain-webapp/pom.xml b/sca-java-2.x/contrib/samples/domain-webapp/pom.xml
index 0b4309a244..0b4309a244 100644
--- a/java/sca-contrib/samples/domain-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/domain-webapp/pom.xml
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/java/node/DomainServer.java b/sca-java-2.x/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
index ea3cddc01b..ea3cddc01b 100644
--- a/java/sca-contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
index fbe5880db6..fbe5880db6 100755
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/domain.composite b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/domain.composite
index dbaaebd3c7..dbaaebd3c7 100644
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/domain.composite
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/domain.composite
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/index.html b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/index.html
index 425bd73734..425bd73734 100644
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/index.html
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/index.html
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/node.png b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/node.png
index b3c949d224..b3c949d224 100644
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/node.png
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/node.png
diff --git a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/style.css b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/style.css
index f5bbf23379..f5bbf23379 100644
--- a/java/sca-contrib/samples/domain-webapp/src/main/resources/webroot/style.css
+++ b/sca-java-2.x/contrib/samples/domain-webapp/src/main/resources/webroot/style.css
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/README b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/README
index 3668a7705e..3668a7705e 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/README
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/README
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
index 1af95a5eff..1af95a5eff 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
index a861a5c50f..a861a5c50f 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/pom.xml b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/pom.xml
index 874327c7b1..874327c7b1 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/pom.xml
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
index 2c90c0db8c..2c90c0db8c 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
index 354ef2d369..354ef2d369 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 736563098f..736563098f 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
index b67fe843ca..b67fe843ca 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
index dea3980e4d..dea3980e4d 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391a87..7b33391a87 100644
--- a/java/sca-contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/contrib/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/java/sca-contrib/samples/feed-aggregator/README b/sca-java-2.x/contrib/samples/feed-aggregator/README
index f73baec2fd..f73baec2fd 100644
--- a/java/sca-contrib/samples/feed-aggregator/README
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/README
diff --git a/java/sca-contrib/samples/feed-aggregator/build.xml b/sca-java-2.x/contrib/samples/feed-aggregator/build.xml
index 0ab6fed7fc..0ab6fed7fc 100644
--- a/java/sca-contrib/samples/feed-aggregator/build.xml
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/build.xml
diff --git a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.png b/sca-java-2.x/contrib/samples/feed-aggregator/feed-aggregator.png
index c8fea8a7b8..c8fea8a7b8 100644
--- a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.png
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/feed-aggregator.png
diff --git a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.svg b/sca-java-2.x/contrib/samples/feed-aggregator/feed-aggregator.svg
index 72fe6a00ac..72fe6a00ac 100644
--- a/java/sca-contrib/samples/feed-aggregator/feed-aggregator.svg
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/feed-aggregator.svg
diff --git a/java/sca-contrib/samples/feed-aggregator/pom.xml b/sca-java-2.x/contrib/samples/feed-aggregator/pom.xml
index ae2aee112c..ae2aee112c 100644
--- a/java/sca-contrib/samples/feed-aggregator/pom.xml
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/pom.xml
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
index 999e9d5520..999e9d5520 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
index dec073c36b..dec073c36b 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
index 354ef2d369..354ef2d369 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
index 1c549f7cd2..1c549f7cd2 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
diff --git a/java/sca-contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 8a3a53b4d5..8a3a53b4d5 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/java/sca-contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java b/sca-java-2.x/contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
index 9fdfe711be..9fdfe711be 100644
--- a/java/sca-contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
+++ b/sca-java-2.x/contrib/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTest.java
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/README b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/README
index 5c669f5da5..5c669f5da5 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/README
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/README
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/build.xml b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/build.xml
index c8917007f1..c8917007f1 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/build.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.png b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/helloworld-bpel.png
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/helloworld-bpel.svg
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/pom.xml b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/pom.xml
index 09cb2cbd53..09cb2cbd53 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
index 971a5373e9..971a5373e9 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
index d9d4363832..d9d4363832 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
index 70273245d7..70273245d7 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
index 97262109e6..97262109e6 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
index 1cb338b283..1cb338b283 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
index c1bc0a0b81..c1bc0a0b81 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
diff --git a/java/sca-contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 6ad63f87d9..6ad63f87d9 100644
--- a/java/sca-contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-bpel/README b/sca-java-2.x/contrib/samples/helloworld-bpel/README
index bf5f500ef3..bf5f500ef3 100644
--- a/java/sca-contrib/samples/helloworld-bpel/README
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/README
diff --git a/java/sca-contrib/samples/helloworld-bpel/build.xml b/sca-java-2.x/contrib/samples/helloworld-bpel/build.xml
index 890a6427b8..890a6427b8 100644
--- a/java/sca-contrib/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/build.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/contrib/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/contrib/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/java/sca-contrib/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/java/sca-contrib/samples/helloworld-bpel/pom.xml b/sca-java-2.x/contrib/samples/helloworld-bpel/pom.xml
index d93676d77d..d93676d77d 100644
--- a/java/sca-contrib/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
index 1826c885c4..1826c885c4 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/deploy.xml b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/deploy.xml
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index a88aa7960c..a88aa7960c 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.componentType
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/java/sca-contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-2.x/contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
index 1caaa78878..1caaa78878 100644
--- a/java/sca-contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-distributed/README b/sca-java-2.x/contrib/samples/helloworld-distributed/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca-contrib/samples/helloworld-distributed/README
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/README
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/README b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/README
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/README
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/pom.xml b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/pom.xml
index 1cdedf7d15..1cdedf7d15 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
index e2b7c698ac..e2b7c698ac 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
index 033b4088c8..033b4088c8 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
index 0f827390c8..0f827390c8 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/README b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/README
index 9462ae4218..9462ae4218 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/build.xml b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
index ef49524e39..ef49524e39 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/build.xml
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
index b298c4eb62..b298c4eb62 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
index 04918244f0..04918244f0 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
index 0e8de1be42..0e8de1be42 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
index 1eefec1c48..1eefec1c48 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
index 873329cf7c..873329cf7c 100644
--- a/java/sca-contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/contrib/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/README b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/README
index 38392a13b6..38392a13b6 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/build-dojo.xml
index 534a1dacd9..534a1dacd9 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/build.xml b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/build.xml
index 95813af65a..95813af65a 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/build.xml
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
index d5c3bc5d3e..d5c3bc5d3e 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/pom.xml
index d839ecddc6..d839ecddc6 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index b4997ba907..b4997ba907 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 4195f3288c..4195f3288c 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 2c178c1ddc..2c178c1ddc 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
index 70cd67890a..70cd67890a 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/java/sca-contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/contrib/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/README b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/README
index 9be2e0b0f6..9be2e0b0f6 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/pom.xml
index c2d6155233..c2d6155233 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
index c24a741ee2..c24a741ee2 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
index 17f997f60d..17f997f60d 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
index 47756f46aa..47756f46aa 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
index 2419887413..2419887413 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
index f6328d156c..f6328d156c 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
index bc6ef59a9b..bc6ef59a9b 100644
--- a/java/sca-contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/contrib/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/README b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/README
index 07253d039b..07253d039b 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
index 6ef1f438fb..6ef1f438fb 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/pom.xml
index 9d3b27d8cc..9d3b27d8cc 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 2234e21439..2234e21439 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
index e895ab455d..e895ab455d 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
index 75dd9050fa..75dd9050fa 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
index c8246e15a7..c8246e15a7 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
index 267bed176c..267bed176c 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
index 1071583264..1071583264 100644
--- a/java/sca-contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
+++ b/sca-java-2.x/contrib/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/java/sca-contrib/samples/helloworld-jsp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-jsp/pom.xml
index c2604065ca..c2604065ca 100644
--- a/java/sca-contrib/samples/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
index 16bc08fc10..16bc08fc10 100644
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index 46285614da..46285614da 100644
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
index beac8e457f..beac8e457f 100644
--- a/java/sca-contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/contrib/samples/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/README b/sca-java-2.x/contrib/samples/helloworld-reference-jms/README
index 184e67a239..184e67a239 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/README
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/README
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/build.xml b/sca-java-2.x/contrib/samples/helloworld-reference-jms/build.xml
index 4702beed0d..4702beed0d 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/build.xml
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.png b/sca-java-2.x/contrib/samples/helloworld-reference-jms/helloworld-reference.png
index ab80b1f91c..ab80b1f91c 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.png
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.svg b/sca-java-2.x/contrib/samples/helloworld-reference-jms/helloworld-reference.svg
index 40f4e8f271..40f4e8f271 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/helloworld-reference.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/helloworld-reference.svg
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/pom.xml b/sca-java-2.x/contrib/samples/helloworld-reference-jms/pom.xml
index 77d887509c..77d887509c 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index 5bec27a137..5bec27a137 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
index ca7c90f23e..ca7c90f23e 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
index 3cf1104562..3cf1104562 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
index e692ef8e4c..e692ef8e4c 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
index a2a4067921..a2a4067921 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index e0ea596dd3..e0ea596dd3 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index f5380d9ccd..f5380d9ccd 100644
--- a/java/sca-contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-service-jms/README b/sca-java-2.x/contrib/samples/helloworld-service-jms/README
index 49feabaa07..49feabaa07 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/README
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/README
diff --git a/java/sca-contrib/samples/helloworld-service-jms/build.xml b/sca-java-2.x/contrib/samples/helloworld-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/build.xml
diff --git a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.png b/sca-java-2.x/contrib/samples/helloworld-service-jms/helloworld-service.png
index ef27c71f54..ef27c71f54 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.png
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/helloworld-service.png
diff --git a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.svg b/sca-java-2.x/contrib/samples/helloworld-service-jms/helloworld-service.svg
index dd7a9dd87d..dd7a9dd87d 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/helloworld-service.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/helloworld-service.svg
diff --git a/java/sca-contrib/samples/helloworld-service-jms/pom.xml b/sca-java-2.x/contrib/samples/helloworld-service-jms/pom.xml
index c2be08fa75..c2be08fa75 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
index d4ea391a00..d4ea391a00 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
index 3135cdc320..3135cdc320 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
index 7930f98716..7930f98716 100644
--- a/java/sca-contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
+++ b/sca-java-2.x/contrib/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/java/sca-contrib/samples/helloworld-servlet/pom.xml b/sca-java-2.x/contrib/samples/helloworld-servlet/pom.xml
index 26fa4e62d2..26fa4e62d2 100644
--- a/java/sca-contrib/samples/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index 6b8af48161..6b8af48161 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
index 23fd33a408..23fd33a408 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index 28cfdd3f6c..28cfdd3f6c 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/java/sca-contrib/samples/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/contrib/samples/helloworld-servlet/src/main/webapp/hello.html
diff --git a/java/sca-contrib/samples/helloworld-web-callback/pom.xml b/sca-java-2.x/contrib/samples/helloworld-web-callback/pom.xml
index 4a15d1a8ea..4a15d1a8ea 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
index 2ee8e97e51..2ee8e97e51 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
index 9c1e645776..9c1e645776 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
index 5601bcd990..5601bcd990 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
index fdd5a95f58..fdd5a95f58 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
index f29262a147..f29262a147 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/hello.html b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
index a52cd5d59e..a52cd5d59e 100644
--- a/java/sca-contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
+++ b/sca-java-2.x/contrib/samples/helloworld-web-callback/src/main/webapp/hello.html
diff --git a/java/sca-contrib/samples/helloworld-web/pom.xml b/sca-java-2.x/contrib/samples/helloworld-web/pom.xml
index 48160e795a..48160e795a 100644
--- a/java/sca-contrib/samples/helloworld-web/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-web/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/sca-java-2.x/contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
index 2b92fd4661..2b92fd4661 100644
--- a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-web/src/main/java/sample/HelloworldService.java
diff --git a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
index 2664e75188..2664e75188 100644
--- a/java/sca-contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
index 20cebc2d53..20cebc2d53 100644
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
index f29262a147..f29262a147 100644
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-web/src/main/webapp/hello.html b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/hello.html
index f7f8b2d4a9..f7f8b2d4a9 100644
--- a/java/sca-contrib/samples/helloworld-web/src/main/webapp/hello.html
+++ b/sca-java-2.x/contrib/samples/helloworld-web/src/main/webapp/hello.html
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/README b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/README
index 66040004f8..66040004f8 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/build.xml
index bdb341d26a..bdb341d26a 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/pom.xml
index 0595f43ec2..0595f43ec2 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
index 182fd38fd9..182fd38fd9 100644
--- a/java/sca-contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/README b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/README
index abf10ef1f2..abf10ef1f2 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/README
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..4f83c8ae9d 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/pom.xml
index d1e77ca628..d1e77ca628 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
index b3db243a1f..b3db243a1f 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
index d029ba3e1c..d029ba3e1c 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
index a4eb217310..a4eb217310 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
index 12b0716b5d..12b0716b5d 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/README b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/README
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/pom.xml
index ff6907f223..ff6907f223 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
index 7839c2366b..7839c2366b 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
index 137894c469..137894c469 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
index 663aa4c852..663aa4c852 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
index d246225c76..d246225c76 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
index 5113a98530..5113a98530 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
index 991e4b4881..991e4b4881 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
index 6ea14602b3..6ea14602b3 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
index 3d6364f55f..3d6364f55f 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
index 106e9db988..106e9db988 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
index bbac4c3703..bbac4c3703 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
index 51b70f47c2..51b70f47c2 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/README b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/README
index 167991c8f7..167991c8f7 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/README
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..38f1b7549d 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/pom.xml
index 5694276870..5694276870 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
index 0f1ebf46d6..0f1ebf46d6 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
index a21619fc8a..a21619fc8a 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index ca7c90f23e..ca7c90f23e 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
index 27cef47677..27cef47677 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 8b089c7222..8b089c7222 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
index 0ab3a5a9f1..0ab3a5a9f1 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
index 904befaf60..904befaf60 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
index 3a4b43222d..3a4b43222d 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
index e6fcc6f4a6..e6fcc6f4a6 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
index 848c41d1c7..848c41d1c7 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
index 21f2166560..21f2166560 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/README b/sca-java-2.x/contrib/samples/helloworld-ws-reference/README
index 13c89ab2f6..13c89ab2f6 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/README
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-2.x/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-2.x/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-reference/pom.xml
index 175f7f7038..175f7f7038 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index 8255364e99..8255364e99 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 899ad5ce35..899ad5ce35 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index 662c9affac..662c9affac 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index 7ce89179c2..7ce89179c2 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
index 8226ec884e..8226ec884e 100644
--- a/java/sca-contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/README b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/README
index aa4819927a..aa4819927a 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..386008e707 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
index 2590f02a45..2590f02a45 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
index 56a29db23c..56a29db23c 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/pom.xml
index d714663dc8..d714663dc8 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index 3123223cd3..3123223cd3 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
index fea4e2a16c..fea4e2a16c 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index ed99edb2a2..ed99edb2a2 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
index 34396b1b02..34396b1b02 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
index fe79094b94..fe79094b94 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
index a0b7c37cd9..a0b7c37cd9 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
index 4657c6cdc1..4657c6cdc1 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 6f241cc90c..6f241cc90c 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index b7a7df2c17..b7a7df2c17 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
index 257e65aad4..257e65aad4 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/README b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/README
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
index 333ad53e0a..333ad53e0a 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/pom.xml
index 23c16b4981..23c16b4981 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index de4795ceaf..de4795ceaf 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 0c3025f0c9..0c3025f0c9 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index c255df2897..c255df2897 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index d4fba548d5..d4fba548d5 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 11564c370f..11564c370f 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 4b0c40dafd..4b0c40dafd 100644
--- a/java/sca-contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/README b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/README
index 26272b1d91..26272b1d91 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/README
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/build.xml
index 330de7f7e5..330de7f7e5 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
index 8d2ae98c82..8d2ae98c82 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/pom.xml
index 90f3e7f297..90f3e7f297 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
index 5454487ff6..5454487ff6 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
index 8c881ab0bb..8c881ab0bb 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
index 67079f738e..67079f738e 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
index 10faf374f3..10faf374f3 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
index 3f9e00689e..3f9e00689e 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
index 34f8605d5d..34f8605d5d 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
index 03d566cc17..03d566cc17 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/README b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/README
index f32eb08b05..f32eb08b05 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/README
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..29bbae0173 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
index 53eb552923..53eb552923 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/pom.xml
index b2a1245d79..b2a1245d79 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 2186c00e57..2186c00e57 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index a0081be22d..a0081be22d 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
index ded02f09d6..ded02f09d6 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
index 10fa7b8652..10fa7b8652 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
index 0b4f2399f0..0b4f2399f0 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
index d1e18d7929..d1e18d7929 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
index 068229be6f..068229be6f 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
index 4a14afcd9d..4a14afcd9d 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/README b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/README
index 66040004f8..66040004f8 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/README
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/build.xml
index ff850203b3..ff850203b3 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/pom.xml
index 63dd133c2c..63dd133c2c 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 18f74b083f..18f74b083f 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
index 0b95fbd14f..0b95fbd14f 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 114608e4d8..114608e4d8 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index c514922045..c514922045 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
index 3f3c92fa78..3f3c92fa78 100644
--- a/java/sca-contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service/README b/sca-java-2.x/contrib/samples/helloworld-ws-service/README
index 72417d3160..72417d3160 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/README
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/README
diff --git a/java/sca-contrib/samples/helloworld-ws-service/build.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service/build.xml
index 7a59628c7b..7a59628c7b 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/build.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/build.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-2.x/contrib/samples/helloworld-ws-service/helloworld-ws-service.png
index eab29d0bcd..eab29d0bcd 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-2.x/contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
index 61cd93ead9..61cd93ead9 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/java/sca-contrib/samples/helloworld-ws-service/pom.xml b/sca-java-2.x/contrib/samples/helloworld-ws-service/pom.xml
index a895191917..a895191917 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/pom.xml
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index a75187f0d7..a75187f0d7 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index c37bfcda65..c37bfcda65 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 513c2e3129..513c2e3129 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
index e472b2bada..e472b2bada 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
index 7508887a7d..7508887a7d 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Order.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
index a11d733cc9..a11d733cc9 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
index 0e084bf459..0e084bf459 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
index 9c8ff711ea..9c8ff711ea 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
index 9e7192a0d0..9e7192a0d0 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
index 90dbc3f25e..90dbc3f25e 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
index 73a1b5c45e..73a1b5c45e 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/Status.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
index 64c056b7fb..64c056b7fb 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/java/org/example/orderservice/package-info.java
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
index d767625ae7..d767625ae7 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
index d34891d1af..d34891d1af 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index 454763410c..454763410c 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
index fd8ef74403..fd8ef74403 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/main/resources/wsdl/orderservice.wsdl
diff --git a/java/sca-contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index 189332be91..189332be91 100644
--- a/java/sca-contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/contrib/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/README b/sca-java-2.x/contrib/samples/host-webapp-calculator/README
index 690152ff65..690152ff65 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/README
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/README
diff --git a/java/sca-contrib/samples/host-webapp-calculator/build.xml b/sca-java-2.x/contrib/samples/host-webapp-calculator/build.xml
index bef3f946e9..bef3f946e9 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/build.xml
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/build.xml
diff --git a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.png b/sca-java-2.x/contrib/samples/host-webapp-calculator/calculator-web.png
index f482b8d1c8..f482b8d1c8 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.png
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/calculator-web.png
diff --git a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.svg b/sca-java-2.x/contrib/samples/host-webapp-calculator/calculator-web.svg
index 1b7015b156..1b7015b156 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/calculator-web.svg
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/calculator-web.svg
diff --git a/java/sca-contrib/samples/host-webapp-calculator/pom.xml b/sca-java-2.x/contrib/samples/host-webapp-calculator/pom.xml
index 2e1c719e7d..2e1c719e7d 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/pom.xml
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/pom.xml
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
index 19e43317eb..19e43317eb 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
index e96b0faa96..e96b0faa96 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
index 6a00b85f62..6a00b85f62 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
index 8e3132eaa1..8e3132eaa1 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
index 59bbb0de83..59bbb0de83 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
index e839694501..e839694501 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
index 701ba48203..701ba48203 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
index 4c4366747d..4c4366747d 100644
--- a/java/sca-contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
+++ b/sca-java-2.x/contrib/samples/host-webapp-calculator/src/main/webapp/calc.jsp
diff --git a/java/sca-contrib/samples/implementation-composite/README b/sca-java-2.x/contrib/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/java/sca-contrib/samples/implementation-composite/README
+++ b/sca-java-2.x/contrib/samples/implementation-composite/README
diff --git a/java/sca-contrib/samples/implementation-composite/build.xml b/sca-java-2.x/contrib/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/java/sca-contrib/samples/implementation-composite/build.xml
+++ b/sca-java-2.x/contrib/samples/implementation-composite/build.xml
diff --git a/java/sca-contrib/samples/implementation-composite/implementation-composite.png b/sca-java-2.x/contrib/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/java/sca-contrib/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-2.x/contrib/samples/implementation-composite/implementation-composite.png
diff --git a/java/sca-contrib/samples/implementation-composite/implementation-composite.svg b/sca-java-2.x/contrib/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/java/sca-contrib/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-2.x/contrib/samples/implementation-composite/implementation-composite.svg
diff --git a/java/sca-contrib/samples/implementation-composite/pom.xml b/sca-java-2.x/contrib/samples/implementation-composite/pom.xml
index 91f8af09f3..91f8af09f3 100644
--- a/java/sca-contrib/samples/implementation-composite/pom.xml
+++ b/sca-java-2.x/contrib/samples/implementation-composite/pom.xml
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index 8e2b347604..8e2b347604 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/Target.java
index 703e72fc10..703e72fc10 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index cd9a9746fa..cd9a9746fa 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/java/sca-contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/java/sca-contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-2.x/contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/java/sca-contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-2.x/contrib/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/README b/sca-java-2.x/contrib/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/README
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/README
diff --git a/java/sca-contrib/samples/implementation-crud-extension/build.xml b/sca-java-2.x/contrib/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/build.xml
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/build.xml
diff --git a/java/sca-contrib/samples/implementation-crud-extension/pom.xml b/sca-java-2.x/contrib/samples/implementation-crud-extension/pom.xml
index 6e044bd68e..6e044bd68e 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/pom.xml
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 2f1e5fcba8..2f1e5fcba8 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/java/sca-contrib/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/java/sca-contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-2.x/contrib/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/java/sca-contrib/samples/implementation-crud/README b/sca-java-2.x/contrib/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/java/sca-contrib/samples/implementation-crud/README
+++ b/sca-java-2.x/contrib/samples/implementation-crud/README
diff --git a/java/sca-contrib/samples/implementation-crud/build.xml b/sca-java-2.x/contrib/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/java/sca-contrib/samples/implementation-crud/build.xml
+++ b/sca-java-2.x/contrib/samples/implementation-crud/build.xml
diff --git a/java/sca-contrib/samples/implementation-crud/implementation-crud.png b/sca-java-2.x/contrib/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/java/sca-contrib/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-2.x/contrib/samples/implementation-crud/implementation-crud.png
diff --git a/java/sca-contrib/samples/implementation-crud/implementation-crud.svg b/sca-java-2.x/contrib/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/java/sca-contrib/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-2.x/contrib/samples/implementation-crud/implementation-crud.svg
diff --git a/java/sca-contrib/samples/implementation-crud/pom.xml b/sca-java-2.x/contrib/samples/implementation-crud/pom.xml
index 3fb4252e92..3fb4252e92 100644
--- a/java/sca-contrib/samples/implementation-crud/pom.xml
+++ b/sca-java-2.x/contrib/samples/implementation-crud/pom.xml
diff --git a/java/sca-contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-2.x/contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/java/sca-contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/java/sca-contrib/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-2.x/contrib/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/java/sca-contrib/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-2.x/contrib/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/java/sca-contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-2.x/contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/java/sca-contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-2.x/contrib/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/java/sca-contrib/samples/implementation-notification/README b/sca-java-2.x/contrib/samples/implementation-notification/README
index 7adfa4e5dc..7adfa4e5dc 100644
--- a/java/sca-contrib/samples/implementation-notification/README
+++ b/sca-java-2.x/contrib/samples/implementation-notification/README
diff --git a/java/sca-contrib/samples/implementation-notification/build.xml b/sca-java-2.x/contrib/samples/implementation-notification/build.xml
index 110c7b84c1..110c7b84c1 100644
--- a/java/sca-contrib/samples/implementation-notification/build.xml
+++ b/sca-java-2.x/contrib/samples/implementation-notification/build.xml
diff --git a/java/sca-contrib/samples/implementation-notification/implementation-notification.png b/sca-java-2.x/contrib/samples/implementation-notification/implementation-notification.png
index 0b7ee34bf7..0b7ee34bf7 100644
--- a/java/sca-contrib/samples/implementation-notification/implementation-notification.png
+++ b/sca-java-2.x/contrib/samples/implementation-notification/implementation-notification.png
diff --git a/java/sca-contrib/samples/implementation-notification/pom.xml b/sca-java-2.x/contrib/samples/implementation-notification/pom.xml
index 0ebb3ff7a3..0ebb3ff7a3 100644
--- a/java/sca-contrib/samples/implementation-notification/pom.xml
+++ b/sca-java-2.x/contrib/samples/implementation-notification/pom.xml
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
index bf8c72e0ce..bf8c72e0ce 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
index 7bbfda2122..7bbfda2122 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
index da32bab58d..da32bab58d 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index 17d7933d9e..17d7933d9e 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index e16b509993..e16b509993 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-2.x/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-2.x/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/java/sca-contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca-contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-2.x/contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
index 719141c94b..719141c94b 100644
--- a/java/sca-contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-2.x/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
index 873e200613..873e200613 100644
--- a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-2.x/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
index bbf2281352..bbf2281352 100644
--- a/java/sca-contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ b/sca-java-2.x/contrib/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/README b/sca-java-2.x/contrib/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/README
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/README
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/build.xml b/sca-java-2.x/contrib/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/build.xml
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/pom.xml b/sca-java-2.x/contrib/samples/implementation-pojo-extension/pom.xml
index 6fa7ab7f1c..6fa7ab7f1c 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/pom.xml
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 44a2cc0aa8..44a2cc0aa8 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 0654cb93e5..0654cb93e5 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 30a9885ea9..30a9885ea9 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/java/sca-contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/contrib/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca-contrib/samples/loanapplication/pom.xml b/sca-java-2.x/contrib/samples/loanapplication/pom.xml
index ad76cde4f1..ad76cde4f1 100644
--- a/java/sca-contrib/samples/loanapplication/pom.xml
+++ b/sca-java-2.x/contrib/samples/loanapplication/pom.xml
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 4fedb70782..4fedb70782 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index 023199b14b..023199b14b 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 8d16b04caf..8d16b04caf 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index a88dc0b56b..a88dc0b56b 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/java/sca-contrib/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-2.x/contrib/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/java/sca-contrib/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/java/sca-contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-2.x/contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index e88e48a53a..e88e48a53a 100644
--- a/java/sca-contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-2.x/contrib/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/README b/sca-java-2.x/contrib/samples/osgi-supplychain/README
index 11fecf2ae8..11fecf2ae8 100644
--- a/java/sca-contrib/samples/osgi-supplychain/README
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/README
diff --git a/java/sca-contrib/samples/osgi-supplychain/build-bundles.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/build-bundles.xml
index 7a31e6016b..7a31e6016b 100644
--- a/java/sca-contrib/samples/osgi-supplychain/build-bundles.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/build-bundles.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/build.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/build.xml
index 2e103e5a15..2e103e5a15 100644
--- a/java/sca-contrib/samples/osgi-supplychain/build.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/build.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-2.x/contrib/samples/osgi-supplychain/osgi-supplychain.png
index 2bec57ac8a..2bec57ac8a 100644
--- a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.png
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-2.x/contrib/samples/osgi-supplychain/osgi-supplychain.svg
index 43cb427944..43cb427944 100644
--- a/java/sca-contrib/samples/osgi-supplychain/osgi-supplychain.svg
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/java/sca-contrib/samples/osgi-supplychain/pom.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/pom.xml
index a3140094c5..a3140094c5 100644
--- a/java/sca-contrib/samples/osgi-supplychain/pom.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/pom.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
index 5f40054ada..5f40054ada 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
index 64814487cb..64814487cb 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index b70ddede4f..b70ddede4f 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index cad0749218..cad0749218 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 4c2c8d7604..4c2c8d7604 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 8f1276c4e7..8f1276c4e7 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 3c0bc6aa83..3c0bc6aa83 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index b8bca97bd0..b8bca97bd0 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
index 5c61a0961c..5c61a0961c 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
index 87a184d968..87a184d968 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
index 872ab6601a..872ab6601a 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
index 57fcbbc5d1..57fcbbc5d1 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
index 75fa8029f7..75fa8029f7 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
index 15185f2bf9..15185f2bf9 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
index 675597d80b..675597d80b 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
index 6e1ac3e5a9..6e1ac3e5a9 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
index 88d79e5219..88d79e5219 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
index d95ef5d582..d95ef5d582 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
index de7ac7ec7a..de7ac7ec7a 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
index 21241a6899..21241a6899 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
index b5c5a862be..b5c5a862be 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
index 5b368afd5b..5b368afd5b 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
index 47897d16ca..47897d16ca 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
index cae7fdfde2..cae7fdfde2 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
index f5333c7caa..f5333c7caa 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
index d894309b71..d894309b71 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
index 6166549e5a..6166549e5a 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
index 0bbfed9176..0bbfed9176 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
index d1e11168e2..d1e11168e2 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/java/sca-contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index ff15c0d9a2..ff15c0d9a2 100644
--- a/java/sca-contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/java/sca-contrib/samples/photo-gallery/README b/sca-java-2.x/contrib/samples/photo-gallery/README
index c66edea985..c66edea985 100644
--- a/java/sca-contrib/samples/photo-gallery/README
+++ b/sca-java-2.x/contrib/samples/photo-gallery/README
diff --git a/java/sca-contrib/samples/photo-gallery/build.xml b/sca-java-2.x/contrib/samples/photo-gallery/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca-contrib/samples/photo-gallery/build.xml
+++ b/sca-java-2.x/contrib/samples/photo-gallery/build.xml
diff --git a/java/sca-contrib/samples/photo-gallery/photo-gallery.png b/sca-java-2.x/contrib/samples/photo-gallery/photo-gallery.png
index da413edeee..da413edeee 100644
--- a/java/sca-contrib/samples/photo-gallery/photo-gallery.png
+++ b/sca-java-2.x/contrib/samples/photo-gallery/photo-gallery.png
diff --git a/java/sca-contrib/samples/photo-gallery/photo-gallery.svg b/sca-java-2.x/contrib/samples/photo-gallery/photo-gallery.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca-contrib/samples/photo-gallery/photo-gallery.svg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/photo-gallery.svg
diff --git a/java/sca-contrib/samples/photo-gallery/pom.xml b/sca-java-2.x/contrib/samples/photo-gallery/pom.xml
index b96a89f0fc..b96a89f0fc 100644
--- a/java/sca-contrib/samples/photo-gallery/pom.xml
+++ b/sca-java-2.x/contrib/samples/photo-gallery/pom.xml
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
index 1007cd49b0..1007cd49b0 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
index d07dc63592..d07dc63592 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/Album.java b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/Album.java
index d614b6a504..d614b6a504 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/Album.java
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/Album.java
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
index 3cdc56e641..3cdc56e641 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/AlbumImpl.java
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
index 8ede831ea0..8ede831ea0 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery.html b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery.html
index f6566e88ec..f6566e88ec 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery.html
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery.html
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
index 9437b321e2..9437b321e2 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
index 07f37ec505..07f37ec505 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
index 2193784271..2193784271 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
index 1532ee2c1b..1532ee2c1b 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
index 17ffd73aec..17ffd73aec 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
index 19e9ec37df..19e9ec37df 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
index 022416dbce..022416dbce 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
index c78a974714..c78a974714 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
index a98070925a..a98070925a 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
index dc83889116..dc83889116 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
index 0e33548135..0e33548135 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/index.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/index.gif
index 7599ac7686..7599ac7686 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/index.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/index.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/index_on.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/index_on.gif
index 153e9879d6..153e9879d6 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/index_on.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/index_on.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next.gif
index 002eaf6951..002eaf6951 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_disabled.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
index 38b1298453..38b1298453 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next_disabled.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_on.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next_on.gif
index 4e5bb3e7ef..4e5bb3e7ef 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/next_on.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/next_on.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
index 23190de555..23190de555 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
index 0bb3c4b4db..0bb3c4b4db 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/photo-gallery.composite
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev.gif
index 4eea10f1dc..4eea10f1dc 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
index 7e35f07076..7e35f07076 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev_disabled.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_on.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev_on.gif
index 3ef9a776bb..3ef9a776bb 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/prev_on.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/prev_on.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/show_slide.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/show_slide.gif
index a5b6a15c2b..a5b6a15c2b 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/show_slide.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/show_slide.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/space.gif b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/space.gif
index 170fe82b65..170fe82b65 100644
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/space.gif
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/space.gif
diff --git a/java/sca-contrib/samples/photo-gallery/src/main/resources/styles.css b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/styles.css
index d23d949858..d23d949858 100755
--- a/java/sca-contrib/samples/photo-gallery/src/main/resources/styles.css
+++ b/sca-java-2.x/contrib/samples/photo-gallery/src/main/resources/styles.css
diff --git a/java/sca-contrib/samples/quote-xquery/README b/sca-java-2.x/contrib/samples/quote-xquery/README
index cf8a4609a6..cf8a4609a6 100644
--- a/java/sca-contrib/samples/quote-xquery/README
+++ b/sca-java-2.x/contrib/samples/quote-xquery/README
diff --git a/java/sca-contrib/samples/quote-xquery/build.xml b/sca-java-2.x/contrib/samples/quote-xquery/build.xml
index a3a5acf102..a3a5acf102 100644
--- a/java/sca-contrib/samples/quote-xquery/build.xml
+++ b/sca-java-2.x/contrib/samples/quote-xquery/build.xml
diff --git a/java/sca-contrib/samples/quote-xquery/pom.xml b/sca-java-2.x/contrib/samples/quote-xquery/pom.xml
index 2fa134132c..2fa134132c 100644
--- a/java/sca-contrib/samples/quote-xquery/pom.xml
+++ b/sca-java-2.x/contrib/samples/quote-xquery/pom.xml
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 81396b056a..81396b056a 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index fb097c46f8..fb097c46f8 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index c54febcd14..c54febcd14 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index ebe0cd51ae..ebe0cd51ae 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index 92341ea26f..92341ea26f 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
index d2d175430b..d2d175430b 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 5669738c98..5669738c98 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 1a71abab81..1a71abab81 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 5aea04bfb1..5aea04bfb1 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
index 26331381a8..26331381a8 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
index 8ed02dc1ef..8ed02dc1ef 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 103d19e59d..103d19e59d 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
index cfd201f883..cfd201f883 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 26bcfe9707..26bcfe9707 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
index adc852acd4..adc852acd4 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
index 3fa3cdb637..3fa3cdb637 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
index d504f40f04..d504f40f04 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
index cc50da164a..cc50da164a 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
index cf41ab528d..cf41ab528d 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
index e7f3e67068..e7f3e67068 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
index 4c437586ef..4c437586ef 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
index 4f64850056..4f64850056 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
index 96c2af138a..96c2af138a 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
index 9e35e2ecb2..9e35e2ecb2 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/xqueryquotews.composite
diff --git a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
index 35306b9f89..35306b9f89 100644
--- a/java/sca-contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
diff --git a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/sca-java-2.x/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index 9555532b3e..9555532b3e 100644
--- a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
diff --git a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/sca-java-2.x/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
index 9a4be5bda6..9a4be5bda6 100644
--- a/java/sca-contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
+++ b/sca-java-2.x/contrib/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/README b/sca-java-2.x/contrib/samples/simple-bigbank-spring/README
index bb44d63719..bb44d63719 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/README
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/README
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/build-dojo.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/build-dojo.xml
index 9d282c2dd2..9d282c2dd2 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/build-dojo.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/build-dojo.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/build.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/build.xml
index ecc2596d71..ecc2596d71 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/build.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/pom.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/pom.xml
index 5e71de9a6b..5e71de9a6b 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/pom.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/pom.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-2.x/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
index 593c047f6a..593c047f6a 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-2.x/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index 6252697ffe..6252697ffe 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 3f81f48fb9..3f81f48fb9 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 8596181d7f..8596181d7f 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 2b086ec467..2b086ec467 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
index bcac678cd7..bcac678cd7 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 070cfe12db..070cfe12db 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 7682b729c3..7682b729c3 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
index 9f06a71bae..9f06a71bae 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
index f86fda7c0f..f86fda7c0f 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 488146ebeb..488146ebeb 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
index f7b940f873..f7b940f873 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
index 241347e417..241347e417 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index be86627882..be86627882 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
index ea2dbc7e1c..ea2dbc7e1c 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
index 4bb2ce61ef..4bb2ce61ef 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
index 97dff499ba..97dff499ba 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
index 899d8d7d62..899d8d7d62 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
index b9e26bf81b..b9e26bf81b 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
index 32fa070ffb..32fa070ffb 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
index b30f821f7e..b30f821f7e 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
index 1071583264..1071583264 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/main/resources/web/style.css
diff --git a/java/sca-contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
index d82e383e46..d82e383e46 100644
--- a/java/sca-contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/java/sca-contrib/samples/simple-bigbank/README b/sca-java-2.x/contrib/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/java/sca-contrib/samples/simple-bigbank/README
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/README
diff --git a/java/sca-contrib/samples/simple-bigbank/build.xml b/sca-java-2.x/contrib/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/java/sca-contrib/samples/simple-bigbank/build.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/build.xml
diff --git a/java/sca-contrib/samples/simple-bigbank/pom.xml b/sca-java-2.x/contrib/samples/simple-bigbank/pom.xml
index 82cbdfe4b6..82cbdfe4b6 100644
--- a/java/sca-contrib/samples/simple-bigbank/pom.xml
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/pom.xml
diff --git a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.png b/sca-java-2.x/contrib/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/simple-bigbank.png
diff --git a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.svg b/sca-java-2.x/contrib/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/java/sca-contrib/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/simple-bigbank.svg
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 7a3c184cb2..7a3c184cb2 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 4770c214ab..4770c214ab 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/java/sca-contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/java/sca-contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-2.x/contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/java/sca-contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-2.x/contrib/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/README b/sca-java-2.x/contrib/samples/simple-callback-ws/README
index 6b27718f74..6b27718f74 100644
--- a/java/sca-contrib/samples/simple-callback-ws/README
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/README
diff --git a/java/sca-contrib/samples/simple-callback-ws/build.xml b/sca-java-2.x/contrib/samples/simple-callback-ws/build.xml
index 10b69bd395..10b69bd395 100644
--- a/java/sca-contrib/samples/simple-callback-ws/build.xml
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/build.xml
diff --git a/java/sca-contrib/samples/simple-callback-ws/pom.xml b/sca-java-2.x/contrib/samples/simple-callback-ws/pom.xml
index 5b5d5e666b..5b5d5e666b 100644
--- a/java/sca-contrib/samples/simple-callback-ws/pom.xml
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/pom.xml
diff --git a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-2.x/contrib/samples/simple-callback-ws/simple-callback-ws.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.png
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-2.x/contrib/samples/simple-callback-ws/simple-callback-ws.svg
index 7d9e3de510..7d9e3de510 100644
--- a/java/sca-contrib/samples/simple-callback-ws/simple-callback-ws.svg
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index 7ecb51036f..7ecb51036f 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 7a72f50964..7a72f50964 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index dd26439619..dd26439619 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 6a31d90458..6a31d90458 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
index eeb0e52163..eeb0e52163 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
index 53e7fe66af..53e7fe66af 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
index 8a6465de3a..8a6465de3a 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/java/sca-contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
index 580a7f6b0c..580a7f6b0c 100644
--- a/java/sca-contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/contrib/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/java/sca-contrib/samples/simple-callback/README b/sca-java-2.x/contrib/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/java/sca-contrib/samples/simple-callback/README
+++ b/sca-java-2.x/contrib/samples/simple-callback/README
diff --git a/java/sca-contrib/samples/simple-callback/build.xml b/sca-java-2.x/contrib/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/java/sca-contrib/samples/simple-callback/build.xml
+++ b/sca-java-2.x/contrib/samples/simple-callback/build.xml
diff --git a/java/sca-contrib/samples/simple-callback/pom.xml b/sca-java-2.x/contrib/samples/simple-callback/pom.xml
index 056aef6a1e..056aef6a1e 100644
--- a/java/sca-contrib/samples/simple-callback/pom.xml
+++ b/sca-java-2.x/contrib/samples/simple-callback/pom.xml
diff --git a/java/sca-contrib/samples/simple-callback/simple-callback.png b/sca-java-2.x/contrib/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/java/sca-contrib/samples/simple-callback/simple-callback.png
+++ b/sca-java-2.x/contrib/samples/simple-callback/simple-callback.png
diff --git a/java/sca-contrib/samples/simple-callback/simple-callback.svg b/sca-java-2.x/contrib/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/java/sca-contrib/samples/simple-callback/simple-callback.svg
+++ b/sca-java-2.x/contrib/samples/simple-callback/simple-callback.svg
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 18e159edc3..18e159edc3 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
index a065408954..a065408954 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index dc5493babe..dc5493babe 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/java/sca-contrib/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-2.x/contrib/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/java/sca-contrib/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/java/sca-contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-2.x/contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/java/sca-contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-2.x/contrib/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/pom.xml b/sca-java-2.x/contrib/samples/spi-implementation-pojo/pom.xml
index 870c67b5f2..870c67b5f2 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/pom.xml
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/pom.xml
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
index 73104c3166..73104c3166 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
index 43efae32ca..43efae32ca 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index b33d9a3644..b33d9a3644 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 92c92eb309..92c92eb309 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
index 95ee37c1aa..95ee37c1aa 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
index 02af1ccf22..02af1ccf22 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
index 5813fda330..5813fda330 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/java/sca-contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
index fa9cecc160..fa9cecc160 100644
--- a/java/sca-contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/contrib/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/README b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/README
index 3869ea6a12..3869ea6a12 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/README
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/README
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/build.xml b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/build.xml
index 9d69ee9ba0..9d69ee9ba0 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/build.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/build.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/pom.xml b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/pom.xml
index 5f2b2452ab..5f2b2452ab 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/pom.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/pom.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
index ecaa4e28de..ecaa4e28de 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
index 66a0ba0e63..66a0ba0e63 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
index 665dbbf9ac..665dbbf9ac 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
index 22e9d58a94..22e9d58a94 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
index ba3d43448e..ba3d43448e 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
index 17691af0e8..17691af0e8 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
index c6a230fcb4..c6a230fcb4 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
index 504a4ccfcd..504a4ccfcd 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
index 42e5f824f9..42e5f824f9 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
index 6f11106ddd..6f11106ddd 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
index cfd96f287a..cfd96f287a 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
index 8e7a884d41..8e7a884d41 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/java/sca-contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
index 02a11485cd..02a11485cd 100644
--- a/java/sca-contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/README b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/README
index 17b71e7590..17b71e7590 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/README
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/README
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/build.xml b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/build.xml
index 26d71c146f..26d71c146f 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/build.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/build.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/pom.xml
index b46074b8c8..b46074b8c8 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/pom.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/pom.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
index 9737ac27eb..9737ac27eb 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 4d8b03fc7d..4d8b03fc7d 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index 3ed3086dbd..3ed3086dbd 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
index 562314230a..562314230a 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
index ad17ab8cf5..ad17ab8cf5 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
index 7b44a28bc9..7b44a28bc9 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
index bbd5b0c325..bbd5b0c325 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
index cb26ca809d..cb26ca809d 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
index 5c692df4ec..5c692df4ec 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
index 24da9878a5..24da9878a5 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
index b023adf907..b023adf907 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
index 96a5b2ca1f..96a5b2ca1f 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
index 371a1afd32..371a1afd32 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6491a0d326..6491a0d326 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index b1bce4339d..b1bce4339d 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index d6bfe2167e..d6bfe2167e 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
index 0ce1440ddf..0ce1440ddf 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
index 6b2338f611..6b2338f611 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
index a45630278b..a45630278b 100644
--- a/java/sca-contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/README b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/README
index b90bafeb59..b90bafeb59 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/README
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/README
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/build.xml b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/build.xml
index 1b38a40495..1b38a40495 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/build.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/build.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/pom.xml b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/pom.xml
index 4bf37e88fa..4bf37e88fa 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/pom.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/pom.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 833cc50f71..833cc50f71 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
index d6db2bd182..d6db2bd182 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
index 643f9a187c..643f9a187c 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
index da96f29b0c..da96f29b0c 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
index 87dd006b5a..87dd006b5a 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
index 06544c6883..06544c6883 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/java/sca-contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
index 4b36d0694d..4b36d0694d 100644
--- a/java/sca-contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
+++ b/sca-java-2.x/contrib/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
diff --git a/java/sca-contrib/samples/store-distributed/README b/sca-java-2.x/contrib/samples/store-distributed/README
index 46e71bf51e..46e71bf51e 100644
--- a/java/sca-contrib/samples/store-distributed/README
+++ b/sca-java-2.x/contrib/samples/store-distributed/README
diff --git a/java/sca-contrib/samples/store-distributed/build.xml b/sca-java-2.x/contrib/samples/store-distributed/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca-contrib/samples/store-distributed/build.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/build.xml
diff --git a/java/sca-contrib/samples/store-distributed/cloud.composite b/sca-java-2.x/contrib/samples/store-distributed/cloud.composite
index 7bd13d5b6f..7bd13d5b6f 100644
--- a/java/sca-contrib/samples/store-distributed/cloud.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/cloud.composite
diff --git a/java/sca-contrib/samples/store-distributed/domain.composite b/sca-java-2.x/contrib/samples/store-distributed/domain.composite
index 6898c454af..6898c454af 100644
--- a/java/sca-contrib/samples/store-distributed/domain.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/domain.composite
diff --git a/java/sca-contrib/samples/store-distributed/pom.xml b/sca-java-2.x/contrib/samples/store-distributed/pom.xml
index e812ae0b10..e812ae0b10 100644
--- a/java/sca-contrib/samples/store-distributed/pom.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/pom.xml
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
index dd19f6b49b..dd19f6b49b 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchDomain.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
index 9016e515fb..9016e515fb 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeA.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
index 2b387aec82..2b387aec82 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeB.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
index fb138e484f..fb138e484f 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/node/LaunchStoreNodeC.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Cart.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Cart.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Cart.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Catalog.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Catalog.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/CurrencyConverter.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/CurrencyConverterImpl.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Item.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Item.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Item.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/java/services/Total.java b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/java/services/Total.java
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/java/services/Total.java
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
index f7bfd0fcb6..f7bfd0fcb6 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
index 187c5caf1c..187c5caf1c 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
index 98113a3576..98113a3576 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index f165ee0e29..f165ee0e29 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/store.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
index 2ac608d43f..2ac608d43f 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeA/store.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 0f8e76ccd7..0f8e76ccd7 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/store.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
index 062a7aa2cd..062a7aa2cd 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeB/store.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index 15bab17c1a..15bab17c1a 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/store.composite b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
index 5de310128d..5de310128d 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/store.composite
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/nodeC/uiservices/store.html
diff --git a/java/sca-contrib/samples/store-distributed/src/main/resources/uiservices/store.html b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca-contrib/samples/store-distributed/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/contrib/samples/store-distributed/src/main/resources/uiservices/store.html
diff --git a/java/sca-contrib/samples/store-distributed/store.png b/sca-java-2.x/contrib/samples/store-distributed/store.png
index da413edeee..da413edeee 100644
--- a/java/sca-contrib/samples/store-distributed/store.png
+++ b/sca-java-2.x/contrib/samples/store-distributed/store.png
diff --git a/java/sca-contrib/samples/store-distributed/store.svg b/sca-java-2.x/contrib/samples/store-distributed/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca-contrib/samples/store-distributed/store.svg
+++ b/sca-java-2.x/contrib/samples/store-distributed/store.svg
diff --git a/java/sca-contrib/samples/store-distributed/workspace.xml b/sca-java-2.x/contrib/samples/store-distributed/workspace.xml
index d6cb2bfc81..d6cb2bfc81 100644
--- a/java/sca-contrib/samples/store-distributed/workspace.xml
+++ b/sca-java-2.x/contrib/samples/store-distributed/workspace.xml
diff --git a/java/sca-contrib/samples/store/README b/sca-java-2.x/contrib/samples/store/README
index 46e71bf51e..46e71bf51e 100644
--- a/java/sca-contrib/samples/store/README
+++ b/sca-java-2.x/contrib/samples/store/README
diff --git a/java/sca-contrib/samples/store/build.xml b/sca-java-2.x/contrib/samples/store/build.xml
index 652afc3570..652afc3570 100644
--- a/java/sca-contrib/samples/store/build.xml
+++ b/sca-java-2.x/contrib/samples/store/build.xml
diff --git a/java/sca-contrib/samples/store/pom.xml b/sca-java-2.x/contrib/samples/store/pom.xml
index d68563807a..d68563807a 100644
--- a/java/sca-contrib/samples/store/pom.xml
+++ b/sca-java-2.x/contrib/samples/store/pom.xml
diff --git a/java/sca-contrib/samples/store/src/main/java/launch/Launch.java b/sca-java-2.x/contrib/samples/store/src/main/java/launch/Launch.java
index 801697abea..801697abea 100644
--- a/java/sca-contrib/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/launch/Launch.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Cart.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/Cart.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Catalog.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/Catalog.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Item.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/Item.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/Item.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/java/sca-contrib/samples/store/src/main/java/services/Total.java b/sca-java-2.x/contrib/samples/store/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca-contrib/samples/store/src/main/java/services/Total.java
+++ b/sca-java-2.x/contrib/samples/store/src/main/java/services/Total.java
diff --git a/java/sca-contrib/samples/store/src/main/resources/store.composite b/sca-java-2.x/contrib/samples/store/src/main/resources/store.composite
index 571678839d..571678839d 100644
--- a/java/sca-contrib/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/contrib/samples/store/src/main/resources/store.composite
diff --git a/java/sca-contrib/samples/store/src/main/resources/uiservices/store.html b/sca-java-2.x/contrib/samples/store/src/main/resources/uiservices/store.html
index 45604463d1..45604463d1 100644
--- a/java/sca-contrib/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/contrib/samples/store/src/main/resources/uiservices/store.html
diff --git a/java/sca-contrib/samples/store/store.png b/sca-java-2.x/contrib/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/java/sca-contrib/samples/store/store.png
+++ b/sca-java-2.x/contrib/samples/store/store.png
diff --git a/java/sca-contrib/samples/store/store.svg b/sca-java-2.x/contrib/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/java/sca-contrib/samples/store/store.svg
+++ b/sca-java-2.x/contrib/samples/store/store.svg
diff --git a/java/sca-contrib/samples/supplychain/README b/sca-java-2.x/contrib/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/java/sca-contrib/samples/supplychain/README
+++ b/sca-java-2.x/contrib/samples/supplychain/README
diff --git a/java/sca-contrib/samples/supplychain/build.xml b/sca-java-2.x/contrib/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/java/sca-contrib/samples/supplychain/build.xml
+++ b/sca-java-2.x/contrib/samples/supplychain/build.xml
diff --git a/java/sca-contrib/samples/supplychain/pom.xml b/sca-java-2.x/contrib/samples/supplychain/pom.xml
index 2e85d79793..2e85d79793 100644
--- a/java/sca-contrib/samples/supplychain/pom.xml
+++ b/sca-java-2.x/contrib/samples/supplychain/pom.xml
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Customer.java
index 6c19a1108e..6c19a1108e 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 0323cebe11..0323cebe11 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index 809e2b7b89..809e2b7b89 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 59513eca5d..59513eca5d 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index ff4f5e62eb..ff4f5e62eb 100644
--- a/java/sca-contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/java/sca-contrib/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-2.x/contrib/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/java/sca-contrib/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-2.x/contrib/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/java/sca-contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-2.x/contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/java/sca-contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/java/sca-contrib/samples/supplychain/supplychain.png b/sca-java-2.x/contrib/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/java/sca-contrib/samples/supplychain/supplychain.png
+++ b/sca-java-2.x/contrib/samples/supplychain/supplychain.png
diff --git a/java/sca-contrib/samples/supplychain/supplychain.svg b/sca-java-2.x/contrib/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/java/sca-contrib/samples/supplychain/supplychain.svg
+++ b/sca-java-2.x/contrib/samples/supplychain/supplychain.svg
diff --git a/java/sca-contrib/samples/web-resource/README b/sca-java-2.x/contrib/samples/web-resource/README
index 56bffba6a3..56bffba6a3 100644
--- a/java/sca-contrib/samples/web-resource/README
+++ b/sca-java-2.x/contrib/samples/web-resource/README
diff --git a/java/sca-contrib/samples/web-resource/build.xml b/sca-java-2.x/contrib/samples/web-resource/build.xml
index 5f6b6091e7..5f6b6091e7 100644
--- a/java/sca-contrib/samples/web-resource/build.xml
+++ b/sca-java-2.x/contrib/samples/web-resource/build.xml
diff --git a/java/sca-contrib/samples/web-resource/pom.xml b/sca-java-2.x/contrib/samples/web-resource/pom.xml
index eaa6269819..eaa6269819 100644
--- a/java/sca-contrib/samples/web-resource/pom.xml
+++ b/sca-java-2.x/contrib/samples/web-resource/pom.xml
diff --git a/java/sca-contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-2.x/contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
index 9410de08c4..9410de08c4 100644
--- a/java/sca-contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
+++ b/sca-java-2.x/contrib/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/java/sca-contrib/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-2.x/contrib/samples/web-resource/src/main/resources/WebResource.composite
index 4536136a8b..4536136a8b 100644
--- a/java/sca-contrib/samples/web-resource/src/main/resources/WebResource.composite
+++ b/sca-java-2.x/contrib/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/java/sca-contrib/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-2.x/contrib/samples/web-resource/src/main/resources/myContent/index.html
index 55de048373..55de048373 100644
--- a/java/sca-contrib/samples/web-resource/src/main/resources/myContent/index.html
+++ b/sca-java-2.x/contrib/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/java/sca-contrib/samples/web-resource/web-resource.png b/sca-java-2.x/contrib/samples/web-resource/web-resource.png
index 7259447b65..7259447b65 100644
--- a/java/sca-contrib/samples/web-resource/web-resource.png
+++ b/sca-java-2.x/contrib/samples/web-resource/web-resource.png
diff --git a/java/sca-contrib/samples/web-resource/web-resource.svg b/sca-java-2.x/contrib/samples/web-resource/web-resource.svg
index 0d1257316c..0d1257316c 100644
--- a/java/sca-contrib/samples/web-resource/web-resource.svg
+++ b/sca-java-2.x/contrib/samples/web-resource/web-resource.svg
diff --git a/java/sca-contrib/samples/zipcode-jaxws/LICENSE b/sca-java-2.x/contrib/samples/zipcode-jaxws/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/LICENSE
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/LICENSE
diff --git a/java/sca-contrib/samples/zipcode-jaxws/NOTICE b/sca-java-2.x/contrib/samples/zipcode-jaxws/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/NOTICE
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/NOTICE
diff --git a/java/sca-contrib/samples/zipcode-jaxws/README b/sca-java-2.x/contrib/samples/zipcode-jaxws/README
index 12f81543f0..12f81543f0 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/README
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/README
diff --git a/java/sca-contrib/samples/zipcode-jaxws/build.xml b/sca-java-2.x/contrib/samples/zipcode-jaxws/build.xml
index 85caf5954e..85caf5954e 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/build.xml
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/build.xml
diff --git a/java/sca-contrib/samples/zipcode-jaxws/pom.xml b/sca-java-2.x/contrib/samples/zipcode-jaxws/pom.xml
index 686b948d03..686b948d03 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/pom.xml
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/pom.xml
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
index 8c9a48bf40..8c9a48bf40 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
index 93847c8809..93847c8809 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
index cf9276d417..cf9276d417 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
index 9dc0e41b2b..9dc0e41b2b 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
index 48be94b14a..48be94b14a 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
index 1645e11ca2..1645e11ca2 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
index 45c948b4b4..45c948b4b4 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
index 9e78dc6d0a..9e78dc6d0a 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
index ced83ff09a..ced83ff09a 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
index 22493ba9b8..22493ba9b8 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
index 5ac370005f..5ac370005f 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
index d120f34ee5..d120f34ee5 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
index 5385fb57be..5385fb57be 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
index 9eb205e75d..9eb205e75d 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
index e281509623..e281509623 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
index 08d4a70364..08d4a70364 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
index 9288f5332e..9288f5332e 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
index 0c4fdbcde1..0c4fdbcde1 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
index a4ca6190b5..a4ca6190b5 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
index 0902ce67fe..0902ce67fe 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
index aa000a44d2..aa000a44d2 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
index 8ded0946d9..8ded0946d9 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
index 6543ed7abf..6543ed7abf 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
index 35c114093a..35c114093a 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
index 8865d5fe82..8865d5fe82 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
index c03cf2955f..c03cf2955f 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
index 5ad5f11344..5ad5f11344 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
index f181d9bd0e..f181d9bd0e 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
index 53c112b8a3..53c112b8a3 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
index 7c68a77cf2..7c68a77cf2 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
index a171fe62c9..a171fe62c9 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/USLocation.composite
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
index 0e1b118e44..0e1b118e44 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
index 28d674c29b..28d674c29b 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
diff --git a/java/sca-contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
index 019fce26d6..019fce26d6 100644
--- a/java/sca-contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
+++ b/sca-java-2.x/contrib/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
diff --git a/java/sca-contrib/stest/pom.xml b/sca-java-2.x/contrib/stest/pom.xml
index efdfdd7383..efdfdd7383 100644
--- a/java/sca-contrib/stest/pom.xml
+++ b/sca-java-2.x/contrib/stest/pom.xml
diff --git a/java/sca-contrib/stest/sampleTest/pom.xml b/sca-java-2.x/contrib/stest/sampleTest/pom.xml
index 4bae6b445a..4bae6b445a 100644
--- a/java/sca-contrib/stest/sampleTest/pom.xml
+++ b/sca-java-2.x/contrib/stest/sampleTest/pom.xml
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
index dff88ce8ca..dff88ce8ca 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
index 673dde9590..673dde9590 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
index f6f4f1ccb8..f6f4f1ccb8 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service1.java
index 713fa40563..713fa40563 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service1.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1Superset.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service1Superset.java
index 7d3a2f2e9f..7d3a2f2e9f 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service1Superset.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service1Superset.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service2.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service2.java
index f834a4fbf1..f834a4fbf1 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/Service2.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/Service2.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestException.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestException.java
index 158c5f4522..158c5f4522 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestException.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestException.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.class b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestInvocation.class
index 64e43c20c9..64e43c20c9 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.class
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestInvocation.class
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestInvocation.java
index e5d781095f..e5d781095f 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/TestInvocation.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/TestInvocation.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl.java
index a505f895a2..a505f895a2 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl2.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl2.java
index 0f639fbbf3..0f639fbbf3 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl2.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl2.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl3.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl3.java
index 834dc3ddf7..834dc3ddf7 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl3.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl3.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl4.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl4.java
index 4799d777c7..4799d777c7 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl4.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl4.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl5.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl5.java
index dd69308c95..dd69308c95 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl5.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl5.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl6.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl6.java
index 1810686194..1810686194 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1Impl6.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1Impl6.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java
index f137b7f1b4..f137b7f1b4 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service1SupersetImpl.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/java/test/service2Impl.java b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service2Impl.java
index 919b33014c..919b33014c 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/java/test/service2Impl.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/java/test/service2Impl.java
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient.wsdl b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient.wsdl
index f9475a016a..f9475a016a 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient.wsdl
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient.wsdl
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite
index cf29e199d1..cf29e199d1 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient_0002.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite
index 810a4e761a..810a4e761a 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestClient_0003.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite1.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite1.composite
index 9221a57ba5..9221a57ba5 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite1.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite1.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite10.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite10.composite
index 51f5de625b..51f5de625b 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite10.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite10.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite11.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite11.composite
index 3cc3a4542b..3cc3a4542b 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite11.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite11.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite12.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite12.composite
index 81552d9802..81552d9802 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite12.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite12.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite13.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite13.composite
index 6790a83bc8..6790a83bc8 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite13.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite13.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite14.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite14.composite
index 82a5f98280..82a5f98280 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite14.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite14.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite15.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite15.composite
index 7444094622..7444094622 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite15.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite15.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite16.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite16.composite
index 35301ce4cb..35301ce4cb 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite16.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite16.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite17.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite17.composite
index aff1c2c0e4..aff1c2c0e4 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite17.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite17.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite18.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite18.composite
index 2ae3589b48..2ae3589b48 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite18.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite18.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite19.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite19.composite
index 17a1d99b0a..17a1d99b0a 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite19.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite19.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite2.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite2.composite
index c0770c6d81..c0770c6d81 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite2.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite2.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite20.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite20.composite
index 73f1376947..73f1376947 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite20.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite20.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite21.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite21.composite
index 6cd7451a02..6cd7451a02 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite21.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite21.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite22.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite22.composite
index 0e645f0425..0e645f0425 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite22.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite22.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite23.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite23.composite
index 5f2a5c7193..5f2a5c7193 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite23.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite23.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite24.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite24.composite
index 758a593235..758a593235 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite24.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite24.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite25.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite25.composite
index 6e6caed073..6e6caed073 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite25.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite25.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite26.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite26.composite
index bd777dc376..bd777dc376 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite26.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite26.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite27.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite27.composite
index edc5bdddad..edc5bdddad 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite27.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite27.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite3.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite3.composite
index a465f45510..a465f45510 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite3.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite3.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite4.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite4.composite
index f89546b8da..f89546b8da 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite4.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite4.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite5.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite5.composite
index d5f7e21dc6..d5f7e21dc6 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite5.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite5.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite6.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite6.composite
index 7f5a588e31..7f5a588e31 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite6.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite6.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite7.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite7.composite
index ea432f9145..ea432f9145 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite7.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite7.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite8.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite8.composite
index ef5d75af39..ef5d75af39 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite8.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite8.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite9.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite9.composite
index a71d0d4e0b..a71d0d4e0b 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestComposite9.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestComposite9.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite
index 193ab924bc..193ab924bc 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestDuplicate1.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite
index 3445d07a85..3445d07a85 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/TestDuplicate2.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
index ae5885596e..ae5885596e 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0001.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
index 0d50dc4f4c..0d50dc4f4c 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
index cfce6d0d48..cfce6d0d48 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0003.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
index ca75c33a71..ca75c33a71 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0004.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
index aa9b8af911..aa9b8af911 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
index 3212c595b3..3212c595b3 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
index 1f63746464..1f63746464 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0007.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
index 4b078ca7a3..4b078ca7a3 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0008.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
index 62ba494dcd..62ba494dcd 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0009.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
index 4454a75278..4454a75278 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0010.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
index 447cbcc83d..447cbcc83d 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0011.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
index c48b5ca601..c48b5ca601 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0012.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
index 91cca790ad..91cca790ad 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0013.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
index 698f7896a3..698f7896a3 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0014.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
index 01c1d1d450..01c1d1d450 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0015.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
index 98e2ffa41a..98e2ffa41a 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0016.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
index d2c065ffd1..d2c065ffd1 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0017.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
index 4684bd5afe..4684bd5afe 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0018.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
index 106ed5e5bd..106ed5e5bd 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0019.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
index 70b5a7b3c1..70b5a7b3c1 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0020.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
index e40949b012..e40949b012 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0021.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
index 1bd3b43b2c..1bd3b43b2c 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0022.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
index a3a6465c09..a3a6465c09 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0023.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
index a140e3bfd5..a140e3bfd5 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
index 3209916612..3209916612 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
index 45e7420646..45e7420646 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0026.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
index aa411a1955..aa411a1955 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0027.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
index 07d36a29fd..07d36a29fd 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0028.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
index c35c2a4dca..c35c2a4dca 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0029.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
index 27a652958d..27a652958d 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0030.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
index d68fcac87d..d68fcac87d 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0031.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
index 06cce10ffe..06cce10ffe 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0032.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
index 070b23d1ec..070b23d1ec 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0033.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
index 37e282b5d5..37e282b5d5 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0034.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
index 9a5e53e75c..9a5e53e75c 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_0101.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
index cd4701ff57..cd4701ff57 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6001.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
index e5d59e186a..e5d59e186a 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6002.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
index c65c8634f8..c65c8634f8 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6003.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
index 779358b5d3..779358b5d3 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6004.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
index ea27808b17..ea27808b17 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6005.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
index 04647af815..04647af815 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6006.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
index ed7f358e8d..ed7f358e8d 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6007.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
index 6f69735871..6f69735871 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6008.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
index fd1cadd870..fd1cadd870 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6009.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
index f9525f171e..f9525f171e 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6010.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
index a702d7b342..a702d7b342 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6011.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
index f032838b50..f032838b50 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6012.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
index 1e3dd250d5..1e3dd250d5 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_ASM_6013.composite
diff --git a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_Types.xsd b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_Types.xsd
index 98c57b1a55..98c57b1a55 100644
--- a/java/sca-contrib/stest/sampleTest/src/main/resources/Test_Types.xsd
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/main/resources/Test_Types.xsd
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
index 531a5a817b..531a5a817b 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
index 2f60ad5fca..2f60ad5fca 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
index 6991447961..6991447961 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
index a27c1cc08e..a27c1cc08e 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
index 36e1e53d6e..36e1e53d6e 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
index b5528b35b3..b5528b35b3 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
index 0c6c9201c9..0c6c9201c9 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
index 415e23a6b2..415e23a6b2 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
index f74589ff1a..f74589ff1a 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
index 309c2a7ae6..309c2a7ae6 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
index d5c166134d..d5c166134d 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
index 11ec31907a..11ec31907a 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
index 35b8383c91..35b8383c91 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
index e0c64e8851..e0c64e8851 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
index 9ad6bb27c7..9ad6bb27c7 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
index d1638fd809..d1638fd809 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
index db49cee512..db49cee512 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
index f4189fcaf5..f4189fcaf5 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
index 50fec1f0a9..50fec1f0a9 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
index 286533a9ee..286533a9ee 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
index 6b64407545..6b64407545 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
index f3814b6b0a..f3814b6b0a 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
index 7f0ce03ae2..7f0ce03ae2 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
index 6f022457cc..6f022457cc 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
index 56be980561..56be980561 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
index cbe3841832..cbe3841832 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
index 86f73c02cf..86f73c02cf 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
index aa4cbd44d4..aa4cbd44d4 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
index cc34a7f33b..cc34a7f33b 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
index d7d9904290..d7d9904290 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java
index 97b952b139..97b952b139 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java
index 87fa6cdde5..87fa6cdde5 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java
index 69f4e55012..69f4e55012 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java
index ba1666f2cb..ba1666f2cb 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java
index 7827b2dbda..7827b2dbda 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java
index c6ebf7134f..c6ebf7134f 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java
index 41e7e5719e..41e7e5719e 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java
index 46a76d351a..46a76d351a 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java
index 4fef884d1a..4fef884d1a 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java
index da23a732e8..da23a732e8 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java
index 54c85059bd..54c85059bd 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java
index eaff618911..eaff618911 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java
index e354e84787..e354e84787 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java
index 35e0d93093..35e0d93093 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java
index 60f35f399c..60f35f399c 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java
index c3b0642019..c3b0642019 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
index bf2142b41d..bf2142b41d 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java
index 739417e0d7..739417e0d7 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/BaseTestCase.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java
index 99e9937bcb..99e9937bcb 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/client/TestConfiguration.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java
index 4b6011e2e3..4b6011e2e3 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/InvokeTest.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
index 934e13b744..934e13b744 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
index 1cdc02c2d2..1cdc02c2d2 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/README.txt b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/README.txt
index d376ab955d..d376ab955d 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/README.txt
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/README.txt
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestException.java
index a400c1a362..a400c1a362 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestException.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
index 7e58b83da3..7e58b83da3 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java
index e9b74e2ae4..e9b74e2ae4 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestInvocation.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
index b13e69087c..b13e69087c 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
diff --git a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/package-info.java b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/package-info.java
index 847e70af9f..847e70af9f 100644
--- a/java/sca-contrib/stest/sampleTest/src/test/java/testClient/package-info.java
+++ b/sca-java-2.x/contrib/stest/sampleTest/src/test/java/testClient/package-info.java
diff --git a/java/sca-contrib/tools/eclipse/features/core/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/core/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/java/sca-contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/core/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/core/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/core/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/core/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/core/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/core/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/core/feature.xml
index 1a20ac1eb1..1a20ac1eb1 100644
--- a/java/sca-contrib/tools/eclipse/features/core/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/core/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/core/pom.xml
index f2f273bb65..f2f273bb65 100644
--- a/java/sca-contrib/tools/eclipse/features/core/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/core/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/ejava/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/ejava/feature.xml
index ef2ab6c2ba..ef2ab6c2ba 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/ejava/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/ejava/pom.xml
index 36fa3c4e47..36fa3c4e47 100644
--- a/java/sca-contrib/tools/eclipse/features/ejava/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/ejava/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/features/manager/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/manager/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/manager/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/manager/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/manager/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/manager/feature.xml
index 189342993d..189342993d 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/manager/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/manager/pom.xml
index 520b252773..520b252773 100644
--- a/java/sca-contrib/tools/eclipse/features/manager/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/manager/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/features/process/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/process/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/java/sca-contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/process/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/process/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/process/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/process/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/process/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/process/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/process/feature.xml
index 08332be61e..08332be61e 100644
--- a/java/sca-contrib/tools/eclipse/features/process/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/process/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/process/pom.xml
index cb09cf3cd4..cb09cf3cd4 100644
--- a/java/sca-contrib/tools/eclipse/features/process/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/process/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/features/web20/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/web20/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/web20/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/web20/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/web20/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/web20/feature.xml
index 8fe97d24a3..8fe97d24a3 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/web20/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/web20/pom.xml
index 3045db912f..3045db912f 100644
--- a/java/sca-contrib/tools/eclipse/features/web20/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/web20/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/LICENSE b/sca-java-2.x/contrib/tools/eclipse/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/NOTICE b/sca-java-2.x/contrib/tools/eclipse/features/webservice/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/build.properties b/sca-java-2.x/contrib/tools/eclipse/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/build.properties
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/feature.xml b/sca-java-2.x/contrib/tools/eclipse/features/webservice/feature.xml
index d905b6475c..d905b6475c 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/feature.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/feature.xml
diff --git a/java/sca-contrib/tools/eclipse/features/webservice/pom.xml b/sca-java-2.x/contrib/tools/eclipse/features/webservice/pom.xml
index 0929fef267..0929fef267 100644
--- a/java/sca-contrib/tools/eclipse/features/webservice/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/features/webservice/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/core/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/icons/t.gif b/sca-java-2.x/contrib/tools/eclipse/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/icons/t.gif
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/icons/t.gif
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/icons/tuscany.gif b/sca-java-2.x/contrib/tools/eclipse/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/icons/tuscany.gif
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index 53a8f8b32f..53a8f8b32f 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/core/pom.xml
index faf0f41e8c..faf0f41e8c 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/src/main/assembly/jar.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
index 6861d7afd9..6861d7afd9 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/sca.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/java/sca-contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index eae6682e3b..eae6682e3b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/ejava/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/pom.xml
index 8ee4460619..8ee4460619 100644
--- a/java/sca-contrib/tools/eclipse/plugins/ejava/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/ejava/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 3676883f87..3676883f87 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/manager/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/pom.xml
index 52c70147c0..52c70147c0 100644
--- a/java/sca-contrib/tools/eclipse/plugins/manager/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/manager/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/process/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index 225fa67b58..225fa67b58 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/process/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/process/pom.xml
index 5bb4e38656..5bb4e38656 100644
--- a/java/sca-contrib/tools/eclipse/plugins/process/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/process/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index e153ad3d25..e153ad3d25 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/web20/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/pom.xml
index 8c6c60ceed..8c6c60ceed 100644
--- a/java/sca-contrib/tools/eclipse/plugins/web20/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/web20/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/LICENSE b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/NOTICE b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/NOTICE
index 8591680386..8591680386 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/build.properties b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/build.properties
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/build.properties
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index f588dc191c..f588dc191c 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/plugin.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/plugin.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/plugin.xml
diff --git a/java/sca-contrib/tools/eclipse/plugins/webservice/pom.xml b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/pom.xml
index 9576b496e7..9576b496e7 100644
--- a/java/sca-contrib/tools/eclipse/plugins/webservice/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/plugins/webservice/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/pom.xml b/sca-java-2.x/contrib/tools/eclipse/pom.xml
index 085218098c..085218098c 100644
--- a/java/sca-contrib/tools/eclipse/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/LICENSE b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/eclipse/site/updatesite/LICENSE
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/LICENSE
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/NOTICE b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/eclipse/site/updatesite/NOTICE
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/NOTICE
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/java/sca-contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/etc/generate-p2.sh
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/pom.xml b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/pom.xml
index 7d09e62517..7d09e62517 100644
--- a/java/sca-contrib/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/pom.xml
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/site.xml b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/site.xml
index 3cc6241929..3cc6241929 100644
--- a/java/sca-contrib/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/site.xml
diff --git a/java/sca-contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/java/sca-contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-2.x/contrib/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/LICENSE b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/maven/maven-ant-generator/LICENSE
+++ b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/LICENSE
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/NOTICE b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/maven/maven-ant-generator/NOTICE
+++ b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/NOTICE
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/pom.xml b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/pom.xml
index 35ee115ab0..35ee115ab0 100644
--- a/java/sca-contrib/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/pom.xml
diff --git a/java/sca-contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index d7b80bd67c..d7b80bd67c 100644
--- a/java/sca-contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-2.x/contrib/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/LICENSE b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/LICENSE
+++ b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/LICENSE
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/NOTICE b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/NOTICE
+++ b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/NOTICE
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/README b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/README
index d53760029f..d53760029f 100644
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/README
+++ b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/README
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/pom.xml b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/pom.xml
index 97de3a156f..97de3a156f 100644
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/pom.xml
+++ b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/pom.xml
diff --git a/java/sca-contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
index b904ac4804..b904ac4804 100644
--- a/java/sca-contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
+++ b/sca-java-2.x/contrib/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/LICENSE b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/maven/maven-incremental-build/LICENSE
+++ b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/LICENSE
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/NOTICE b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/maven/maven-incremental-build/NOTICE
+++ b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/NOTICE
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/pom.xml b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/pom.xml
index 854d31cbc0..854d31cbc0 100644
--- a/java/sca-contrib/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/pom.xml
diff --git a/java/sca-contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
index 3a6870732b..3a6870732b 100644
--- a/java/sca-contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ b/sca-java-2.x/contrib/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/LICENSE b/sca-java-2.x/contrib/tools/maven/maven-web-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-contrib/tools/maven/maven-web-junit/LICENSE
+++ b/sca-java-2.x/contrib/tools/maven/maven-web-junit/LICENSE
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/NOTICE b/sca-java-2.x/contrib/tools/maven/maven-web-junit/NOTICE
index 51042eab05..51042eab05 100644
--- a/java/sca-contrib/tools/maven/maven-web-junit/NOTICE
+++ b/sca-java-2.x/contrib/tools/maven/maven-web-junit/NOTICE
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/pom.xml b/sca-java-2.x/contrib/tools/maven/maven-web-junit/pom.xml
index 9078ba586c..9078ba586c 100644
--- a/java/sca-contrib/tools/maven/maven-web-junit/pom.xml
+++ b/sca-java-2.x/contrib/tools/maven/maven-web-junit/pom.xml
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/sca-java-2.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
index d1afe2c995..d1afe2c995 100644
--- a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ b/sca-java-2.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
diff --git a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/sca-java-2.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
index 658d65d7c3..658d65d7c3 100644
--- a/java/sca-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ b/sca-java-2.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
diff --git a/java/sca-contrib/tools/runtime-inspector/LICENSE b/sca-java-2.x/contrib/tools/runtime-inspector/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/runtime-inspector/LICENSE
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/LICENSE
diff --git a/java/sca-contrib/tools/runtime-inspector/NOTICE b/sca-java-2.x/contrib/tools/runtime-inspector/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/runtime-inspector/NOTICE
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/NOTICE
diff --git a/java/sca-contrib/tools/runtime-inspector/pom.xml b/sca-java-2.x/contrib/tools/runtime-inspector/pom.xml
index 8fc3e83948..8fc3e83948 100644
--- a/java/sca-contrib/tools/runtime-inspector/pom.xml
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/pom.xml
diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
index ce91155b53..ce91155b53 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
index 10eb0716e9..10eb0716e9 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
index 883f042172..883f042172 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
index 8001ab7818..8001ab7818 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
index 0710b670cd..0710b670cd 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
diff --git a/java/sca-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/java/sca-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/LICENSE b/sca-java-2.x/contrib/tools/sdo/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/LICENSE
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/LICENSE
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/NOTICE b/sca-java-2.x/contrib/tools/sdo/java2wsdl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/NOTICE
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/NOTICE
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/pom.xml b/sca-java-2.x/contrib/tools/sdo/java2wsdl/pom.xml
index 1a72028147..1a72028147 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/pom.xml
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/pom.xml
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 60afe70534..60afe70534 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index a890dd624d..a890dd624d 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 9c8ff9df9e..9c8ff9df9e 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index f60f7b8ca5..f60f7b8ca5 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 897700ffd9..897700ffd9 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index b793a8ea98..b793a8ea98 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index 18cfafa4e3..18cfafa4e3 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index 3750dc27f5..3750dc27f5 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index d6cd8a7f57..d6cd8a7f57 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 03291428a2..03291428a2 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index cb41c56b94..cb41c56b94 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index 66c9100ef9..66c9100ef9 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index e30ada3af5..e30ada3af5 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index 135b374357..135b374357 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index dfebd77215..dfebd77215 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
index ccc2d3f628..ccc2d3f628 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index c587252d23..c587252d23 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index bf49d98888..bf49d98888 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index cf83095852..cf83095852 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index 901da8e551..901da8e551 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index 78a64dcc64..78a64dcc64 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/java/sca-contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-2.x/contrib/tools/sdo/java2wsdl/src/test/resources/sequences.xsd
diff --git a/java/sca-contrib/tools/sdo/pom.xml b/sca-java-2.x/contrib/tools/sdo/pom.xml
index a73d7aa725..a73d7aa725 100644
--- a/java/sca-contrib/tools/sdo/pom.xml
+++ b/sca-java-2.x/contrib/tools/sdo/pom.xml
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/LICENSE b/sca-java-2.x/contrib/tools/sdo/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/LICENSE
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/LICENSE
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/NOTICE b/sca-java-2.x/contrib/tools/sdo/wsdl2java/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/NOTICE
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/NOTICE
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/pom.xml b/sca-java-2.x/contrib/tools/sdo/wsdl2java/pom.xml
index 2a11edf41e..2a11edf41e 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/pom.xml
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/pom.xml
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index 08c7131208..08c7131208 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 8e0c3683a3..8e0c3683a3 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index 0c4f42633a..0c4f42633a 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 4ab152fb90..4ab152fb90 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index f6d1f3a64a..f6d1f3a64a 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index 3782fa8932..3782fa8932 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index 92581d6ac2..92581d6ac2 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
index 6f2fed1e2a..6f2fed1e2a 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
index dda5a36085..dda5a36085 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/java/sca-contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-2.x/contrib/tools/sdo/wsdl2java/src/test/resources/sequences.xsd
diff --git a/java/sca-contrib/tutorials/pom.xml b/sca-java-2.x/contrib/tutorials/pom.xml
index 331a268016..331a268016 100644
--- a/java/sca-contrib/tutorials/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/pom.xml
diff --git a/java/sca-contrib/tutorials/store/README b/sca-java-2.x/contrib/tutorials/store/README
index 6169a05292..6169a05292 100644
--- a/java/sca-contrib/tutorials/store/README
+++ b/sca-java-2.x/contrib/tutorials/store/README
diff --git a/java/sca-contrib/tutorials/store/Tutorial.pdf b/sca-java-2.x/contrib/tutorials/store/Tutorial.pdf
index e22f1b4c9d..e22f1b4c9d 100644
--- a/java/sca-contrib/tutorials/store/Tutorial.pdf
+++ b/sca-java-2.x/contrib/tutorials/store/Tutorial.pdf
diff --git a/java/sca-contrib/tutorials/store/assets/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/assets/META-INF/sca-contribution.xml
index cba1564cb4..cba1564cb4 100644
--- a/java/sca-contrib/tutorials/store/assets/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/assets/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/assets/pom.xml b/sca-java-2.x/contrib/tutorials/store/assets/pom.xml
index befd197c3f..befd197c3f 100644
--- a/java/sca-contrib/tutorials/store/assets/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/assets/pom.xml
diff --git a/java/sca-contrib/tutorials/store/assets/services/Cart.java b/sca-java-2.x/contrib/tutorials/store/assets/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca-contrib/tutorials/store/assets/services/Cart.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/Cart.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/Catalog.java b/sca-java-2.x/contrib/tutorials/store/assets/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca-contrib/tutorials/store/assets/services/Catalog.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/Catalog.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverter.java b/sca-java-2.x/contrib/tutorials/store/assets/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverter.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/CurrencyConverter.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverterImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/java/sca-contrib/tutorials/store/assets/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/CurrencyConverterImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/FruitsCatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/java/sca-contrib/tutorials/store/assets/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/FruitsCatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/Item.java b/sca-java-2.x/contrib/tutorials/store/assets/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/java/sca-contrib/tutorials/store/assets/services/Item.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/Item.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/ShoppingCartImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/java/sca-contrib/tutorials/store/assets/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/ShoppingCartImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/Total.java b/sca-java-2.x/contrib/tutorials/store/assets/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca-contrib/tutorials/store/assets/services/Total.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/Total.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java
index 0e1155dfcb..0e1155dfcb 100644
--- a/java/sca-contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/VegetablesCatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
index 1414889b81..1414889b81 100644
--- a/java/sca-contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/db/cart.sql b/sca-java-2.x/contrib/tutorials/store/assets/services/db/cart.sql
index 750e23ebde..750e23ebde 100644
--- a/java/sca-contrib/tutorials/store/assets/services/db/cart.sql
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/db/cart.sql
diff --git a/java/sca-contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java
index 1acd30d719..1acd30d719 100644
--- a/java/sca-contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/map/FruitsCatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java
index 8a7306c83c..8a7306c83c 100644
--- a/java/sca-contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/market/MarketCatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java
index 3f8cee085d..3f8cee085d 100644
--- a/java/sca-contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/assets/services/merger/MergedCatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/assets/tutorial.html b/sca-java-2.x/contrib/tutorials/store/assets/tutorial.html
index 14f81e0c22..14f81e0c22 100644
--- a/java/sca-contrib/tutorials/store/assets/tutorial.html
+++ b/sca-java-2.x/contrib/tutorials/store/assets/tutorial.html
diff --git a/java/sca-contrib/tutorials/store/assets/uiservices/store.html b/sca-java-2.x/contrib/tutorials/store/assets/uiservices/store.html
index f2425b4885..f2425b4885 100644
--- a/java/sca-contrib/tutorials/store/assets/uiservices/store.html
+++ b/sca-java-2.x/contrib/tutorials/store/assets/uiservices/store.html
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/pom.xml b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/pom.xml
index 8e8b17cecb..8e8b17cecb 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/pom.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
index c7ad31b682..c7ad31b682 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
index 7e79fc8b9d..7e79fc8b9d 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
index cf81539ba5..cf81539ba5 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
index ff2004fe1b..ff2004fe1b 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
index a0a7adf6fa..a0a7adf6fa 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
index 04d77ee39e..04d77ee39e 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
index 2e46b31047..2e46b31047 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
index bc57b35e79..bc57b35e79 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
index f733524809..f733524809 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
index f9bd16f050..f9bd16f050 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
index 6930093042..6930093042 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
index 3482ebb9ec..3482ebb9ec 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
index d848fbb280..d848fbb280 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
index 6efc86b608..6efc86b608 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
index bdc1a5cfd5..bdc1a5cfd5 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
index a24108714e..a24108714e 100644
--- a/java/sca-contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
index 88950bf740..88950bf740 100644
--- a/java/sca-contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/catalog-mediation.composite b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/catalog-mediation.composite
index d832e88acc..d832e88acc 100644
--- a/java/sca-contrib/tutorials/store/catalog-mediation/catalog-mediation.composite
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/catalog-mediation.composite
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/pom.xml b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/pom.xml
index 8c508f2224..8c508f2224 100644
--- a/java/sca-contrib/tutorials/store/catalog-mediation/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/pom.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
index 2271034dae..2271034dae 100644
--- a/java/sca-contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/catalog-web.composite b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/catalog-web.composite
index 3ba76da078..3ba76da078 100644
--- a/java/sca-contrib/tutorials/store/catalog-webapp/catalog-web.composite
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/catalog-web.composite
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/pom.xml b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/pom.xml
index a07d468892..a07d468892 100644
--- a/java/sca-contrib/tutorials/store/catalog-webapp/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/pom.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
index 7f06dc7ccb..7f06dc7ccb 100644
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
index e08d617dad..e08d617dad 100644
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
diff --git a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp
index dcee7c33f4..dcee7c33f4 100644
--- a/java/sca-contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp
+++ b/sca-java-2.x/contrib/tutorials/store/catalog-webapp/webapp/catalog.jsp
diff --git a/java/sca-contrib/tutorials/store/domain/cloud.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud.composite
index 8f879c5261..8f879c5261 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite
index 02e83d4c8d..02e83d4c8d 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogEJBNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite
index bac96d9781..bac96d9781 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogMediationNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite
index f3ed2dfdd5..f3ed2dfdd5 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogWebAppNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CatalogsNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogsNode.composite
index 3a5ec770cb..3a5ec770cb 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/CatalogsNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CatalogsNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/CurrencyNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CurrencyNode.composite
index ed80268f22..ed80268f22 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/CurrencyNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/CurrencyNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreClientNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreClientNode.composite
index 91948b5476..91948b5476 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreClientNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreClientNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreDBNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreDBNode.composite
index 9b09bd7344..9b09bd7344 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreDBNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreDBNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreEUNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreEUNode.composite
index 6a50de56d5..6a50de56d5 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreEUNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreEUNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMarketNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMarketNode.composite
index 1bdd994c2b..1bdd994c2b 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMarketNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMarketNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMashupNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMashupNode.composite
index 0db43df8c3..0db43df8c3 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMashupNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMashupNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreMergerNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMergerNode.composite
index 0ce6e6a231..0ce6e6a231 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreMergerNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreMergerNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreNode.composite
index e2b61a98e1..e2b61a98e1 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite
index df46bb8813..df46bb8813 100644
--- a/java/sca-contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/cloud/StoreSupplierNode.composite
diff --git a/java/sca-contrib/tutorials/store/domain/domain.composite b/sca-java-2.x/contrib/tutorials/store/domain/domain.composite
index 8d47697df8..8d47697df8 100644
--- a/java/sca-contrib/tutorials/store/domain/domain.composite
+++ b/sca-java-2.x/contrib/tutorials/store/domain/domain.composite
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
index 4e0772d211..4e0772d211 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java
index a0c04a2f34..a0c04a2f34 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCatalogsNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java
index d9110f5804..d9110f5804 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchCurrencyNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java
index b83db75646..b83db75646 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreDBNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java
index de0e421e2d..de0e421e2d 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreEUNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java
index b95d2a8d74..b95d2a8d74 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMarketNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java
index aa7cbdc4ca..aa7cbdc4ca 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMashupNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java
index a29c9b7d61..a29c9b7d61 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreMergerNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreNode.java
index 11f1b2ce86..11f1b2ce86 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
index fce27d7d3b..fce27d7d3b 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
diff --git a/java/sca-contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
index 7408e99c63..7408e99c63 100644
--- a/java/sca-contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
+++ b/sca-java-2.x/contrib/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
diff --git a/java/sca-contrib/tutorials/store/domain/pom.xml b/sca-java-2.x/contrib/tutorials/store/domain/pom.xml
index 808195c491..808195c491 100644
--- a/java/sca-contrib/tutorials/store/domain/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/domain/pom.xml
diff --git a/java/sca-contrib/tutorials/store/domain/workspace.xml b/sca-java-2.x/contrib/tutorials/store/domain/workspace.xml
index 9cdbe04ac7..9cdbe04ac7 100644
--- a/java/sca-contrib/tutorials/store/domain/workspace.xml
+++ b/sca-java-2.x/contrib/tutorials/store/domain/workspace.xml
diff --git a/java/sca-contrib/tutorials/store/pom.xml b/sca-java-2.x/contrib/tutorials/store/pom.xml
index 69db461cfc..69db461cfc 100644
--- a/java/sca-contrib/tutorials/store/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-client/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-client/META-INF/sca-contribution.xml
index 30ffa61ed2..30ffa61ed2 100644
--- a/java/sca-contrib/tutorials/store/store-client/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-client/client/Shopper.java b/sca-java-2.x/contrib/tutorials/store/store-client/client/Shopper.java
index 4e2fa63493..4e2fa63493 100644
--- a/java/sca-contrib/tutorials/store/store-client/client/Shopper.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/client/Shopper.java
diff --git a/java/sca-contrib/tutorials/store/store-client/client/ShopperImpl.java b/sca-java-2.x/contrib/tutorials/store/store-client/client/ShopperImpl.java
index eef92b71f1..eef92b71f1 100644
--- a/java/sca-contrib/tutorials/store/store-client/client/ShopperImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/client/ShopperImpl.java
diff --git a/java/sca-contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java b/sca-java-2.x/contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java
index d1a9dfb36c..d1a9dfb36c 100644
--- a/java/sca-contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/launch/LaunchStoreClientNode.java
diff --git a/java/sca-contrib/tutorials/store/store-client/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-client/pom.xml
index 24909223cb..24909223cb 100644
--- a/java/sca-contrib/tutorials/store/store-client/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Cart.java b/sca-java-2.x/contrib/tutorials/store/store-client/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/java/sca-contrib/tutorials/store/store-client/services/Cart.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/services/Cart.java
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Catalog.java b/sca-java-2.x/contrib/tutorials/store/store-client/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/java/sca-contrib/tutorials/store/store-client/services/Catalog.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/services/Catalog.java
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Item.java b/sca-java-2.x/contrib/tutorials/store/store-client/services/Item.java
index 81cefcdbef..81cefcdbef 100644
--- a/java/sca-contrib/tutorials/store/store-client/services/Item.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/services/Item.java
diff --git a/java/sca-contrib/tutorials/store/store-client/services/Total.java b/sca-java-2.x/contrib/tutorials/store/store-client/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/java/sca-contrib/tutorials/store/store-client/services/Total.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/services/Total.java
diff --git a/java/sca-contrib/tutorials/store/store-client/store-client.composite b/sca-java-2.x/contrib/tutorials/store/store-client/store-client.composite
index 3c5f1637ef..3c5f1637ef 100644
--- a/java/sca-contrib/tutorials/store/store-client/store-client.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-client/store-client.composite
diff --git a/java/sca-contrib/tutorials/store/store-db/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-db/META-INF/sca-contribution.xml
index 7a5d5613be..7a5d5613be 100644
--- a/java/sca-contrib/tutorials/store/store-db/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-db/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-db/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-db/pom.xml
index 923c4004b8..923c4004b8 100644
--- a/java/sca-contrib/tutorials/store/store-db/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-db/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-db/store-db.composite b/sca-java-2.x/contrib/tutorials/store/store-db/store-db.composite
index 03094be5ad..03094be5ad 100644
--- a/java/sca-contrib/tutorials/store/store-db/store-db.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-db/store-db.composite
diff --git a/java/sca-contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml
index 552932b0e7..552932b0e7 100644
--- a/java/sca-contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-eu/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-eu/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-eu/pom.xml
index f9e9898695..f9e9898695 100644
--- a/java/sca-contrib/tutorials/store/store-eu/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-eu/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-eu/store-eu.composite b/sca-java-2.x/contrib/tutorials/store/store-eu/store-eu.composite
index a0b8b50975..a0b8b50975 100644
--- a/java/sca-contrib/tutorials/store/store-eu/store-eu.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-eu/store-eu.composite
diff --git a/java/sca-contrib/tutorials/store/store-eu/uiservices/store-eu.html b/sca-java-2.x/contrib/tutorials/store/store-eu/uiservices/store-eu.html
index 4569b76b3f..4569b76b3f 100644
--- a/java/sca-contrib/tutorials/store/store-eu/uiservices/store-eu.html
+++ b/sca-java-2.x/contrib/tutorials/store/store-eu/uiservices/store-eu.html
diff --git a/java/sca-contrib/tutorials/store/store-market/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-market/META-INF/sca-contribution.xml
index 491230c952..491230c952 100644
--- a/java/sca-contrib/tutorials/store/store-market/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-market/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-market/build.xml b/sca-java-2.x/contrib/tutorials/store/store-market/build.xml
index 94c8b2cad8..94c8b2cad8 100644
--- a/java/sca-contrib/tutorials/store/store-market/build.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-market/build.xml
diff --git a/java/sca-contrib/tutorials/store/store-market/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-market/pom.xml
index 5b2aa91bda..5b2aa91bda 100644
--- a/java/sca-contrib/tutorials/store/store-market/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-market/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-market/store-market.composite b/sca-java-2.x/contrib/tutorials/store/store-market/store-market.composite
index 1c225e6c07..1c225e6c07 100644
--- a/java/sca-contrib/tutorials/store/store-market/store-market.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-market/store-market.composite
diff --git a/java/sca-contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml
index 4ec08403e5..4ec08403e5 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-mashup/build-openajax.xml b/sca-java-2.x/contrib/tutorials/store/store-mashup/build-openajax.xml
index 4668dedc1d..4668dedc1d 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/build-openajax.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/build-openajax.xml
diff --git a/java/sca-contrib/tutorials/store/store-mashup/gadget/map-gadget.html b/sca-java-2.x/contrib/tutorials/store/store-mashup/gadget/map-gadget.html
index d76bcad91b..d76bcad91b 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/gadget/map-gadget.html
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/gadget/map-gadget.html
diff --git a/java/sca-contrib/tutorials/store/store-mashup/gadget/store-gadget.html b/sca-java-2.x/contrib/tutorials/store/store-mashup/gadget/store-gadget.html
index c09b9d28c8..c09b9d28c8 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/gadget/store-gadget.html
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/gadget/store-gadget.html
diff --git a/java/sca-contrib/tutorials/store/store-mashup/map-gadget.composite b/sca-java-2.x/contrib/tutorials/store/store-mashup/map-gadget.composite
index 77db2edbf2..77db2edbf2 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/map-gadget.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/map-gadget.composite
diff --git a/java/sca-contrib/tutorials/store/store-mashup/mashup/store-mash.html b/sca-java-2.x/contrib/tutorials/store/store-mashup/mashup/store-mash.html
index aab14bc065..aab14bc065 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/mashup/store-mash.html
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/mashup/store-mash.html
diff --git a/java/sca-contrib/tutorials/store/store-mashup/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-mashup/pom.xml
index 1bfaff5087..1bfaff5087 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-mashup/store-gadget.composite b/sca-java-2.x/contrib/tutorials/store/store-mashup/store-gadget.composite
index 7c10651e52..7c10651e52 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/store-gadget.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/store-gadget.composite
diff --git a/java/sca-contrib/tutorials/store/store-mashup/store-mashup.composite b/sca-java-2.x/contrib/tutorials/store/store-mashup/store-mashup.composite
index 84e4933e63..84e4933e63 100644
--- a/java/sca-contrib/tutorials/store/store-mashup/store-mashup.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-mashup/store-mashup.composite
diff --git a/java/sca-contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml
index 700a84736c..700a84736c 100644
--- a/java/sca-contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-merger/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-merger/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-merger/pom.xml
index 224acad9a2..224acad9a2 100644
--- a/java/sca-contrib/tutorials/store/store-merger/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-merger/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-merger/store-merger.composite b/sca-java-2.x/contrib/tutorials/store/store-merger/store-merger.composite
index 76d77dc693..76d77dc693 100644
--- a/java/sca-contrib/tutorials/store/store-merger/store-merger.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-merger/store-merger.composite
diff --git a/java/sca-contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/java/sca-contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-supplier/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-supplier/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-supplier/pom.xml
index 0aed45f30d..0aed45f30d 100644
--- a/java/sca-contrib/tutorials/store/store-supplier/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-supplier/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-supplier/store-supplier.composite b/sca-java-2.x/contrib/tutorials/store/store-supplier/store-supplier.composite
index 525bc889cb..525bc889cb 100644
--- a/java/sca-contrib/tutorials/store/store-supplier/store-supplier.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store-supplier/store-supplier.composite
diff --git a/java/sca-contrib/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store-test/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/java/sca-contrib/tutorials/store/store-test/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-test/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store-test/client/Shopper.java b/sca-java-2.x/contrib/tutorials/store/store-test/client/Shopper.java
index 4e2fa63493..4e2fa63493 100644
--- a/java/sca-contrib/tutorials/store/store-test/client/Shopper.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-test/client/Shopper.java
diff --git a/java/sca-contrib/tutorials/store/store-test/pom.xml b/sca-java-2.x/contrib/tutorials/store/store-test/pom.xml
index 29f9b04550..29f9b04550 100644
--- a/java/sca-contrib/tutorials/store/store-test/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store-test/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-2.x/contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java
index 5efec4ee2c..5efec4ee2c 100644
--- a/java/sca-contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ b/sca-java-2.x/contrib/tutorials/store/store-test/test/StoreSupplierTestCase.java
diff --git a/java/sca-contrib/tutorials/store/store/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/store/META-INF/sca-contribution.xml
index 3ed6e4a4ef..3ed6e4a4ef 100644
--- a/java/sca-contrib/tutorials/store/store/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/store/pom.xml b/sca-java-2.x/contrib/tutorials/store/store/pom.xml
index 2dcf64bba0..2dcf64bba0 100644
--- a/java/sca-contrib/tutorials/store/store/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/store/pom.xml
diff --git a/java/sca-contrib/tutorials/store/store/store.composite b/sca-java-2.x/contrib/tutorials/store/store/store.composite
index b3f3140c8c..b3f3140c8c 100644
--- a/java/sca-contrib/tutorials/store/store/store.composite
+++ b/sca-java-2.x/contrib/tutorials/store/store/store.composite
diff --git a/java/sca-contrib/tutorials/store/web-services/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/tutorials/store/web-services/META-INF/sca-contribution.xml
index 10fbe6c448..10fbe6c448 100644
--- a/java/sca-contrib/tutorials/store/web-services/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/contrib/tutorials/store/web-services/META-INF/sca-contribution.xml
diff --git a/java/sca-contrib/tutorials/store/web-services/catalogs.composite b/sca-java-2.x/contrib/tutorials/store/web-services/catalogs.composite
index 154d475165..154d475165 100644
--- a/java/sca-contrib/tutorials/store/web-services/catalogs.composite
+++ b/sca-java-2.x/contrib/tutorials/store/web-services/catalogs.composite
diff --git a/java/sca-contrib/tutorials/store/web-services/currency.composite b/sca-java-2.x/contrib/tutorials/store/web-services/currency.composite
index 7a3f70e299..7a3f70e299 100644
--- a/java/sca-contrib/tutorials/store/web-services/currency.composite
+++ b/sca-java-2.x/contrib/tutorials/store/web-services/currency.composite
diff --git a/java/sca-contrib/tutorials/store/web-services/pom.xml b/sca-java-2.x/contrib/tutorials/store/web-services/pom.xml
index 626fb920f9..626fb920f9 100644
--- a/java/sca-contrib/tutorials/store/web-services/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/web-services/pom.xml
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
index e105fa3e9a..e105fa3e9a 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl
index 051c8ad906..051c8ad906 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.wsdl
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
index 36c2ff83e4..36c2ff83e4 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite
index 6f8cc7b878..6f8cc7b878 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/amazoncart.composite
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java
index 69dd06c2ef..69dd06c2ef 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/launch/LaunchAmazonCart.java
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/pom.xml b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/pom.xml
index 7ba441c1f3..7ba441c1f3 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/pom.xml
diff --git a/java/sca-contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java
index ede97f7868..ede97f7868 100644
--- a/java/sca-contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/cart-amazon/test/AmazonCartTestCase.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README
index b5322f82c2..b5322f82c2 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/README
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml
index 0a455f52b7..0a455f52b7 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/build.xml
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar
index 4b5232fd3b..4b5232fd3b 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/lib/AWS2007_05_14.jar
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png
index e88abcbd58..e88abcbd58 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/shoppingstore.png
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java
index 486946b2fc..486946b2fc 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/server/ShoppingStoreServer.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
index 649f5b16a3..649f5b16a3 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
index 12fed3cac6..12fed3cac6 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
index 947b6fda04..947b6fda04 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
index ce121f9d0a..ce121f9d0a 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite
index f03ce10d3b..f03ce10d3b 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/shoppingstore.composite
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl
index 22eba787c6..22eba787c6 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/resources/wsdl/shoppingstore.wsdl
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/pom.xml b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/pom.xml
index 20896bc089..20896bc089 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/pom.xml
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java
index de67e597ac..de67e597ac 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogClient.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java
index c5db53621c..c5db53621c 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/CatalogService.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
index e557950b24..e557950b24 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
index 8b411644ce..8b411644ce 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
index a6cd356d5a..a6cd356d5a 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
index d7fc263740..d7fc263740 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java
index dcd14f5530..dcd14f5530 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/NamespaceContextImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java
index 850ba7d8ae..850ba7d8ae 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/util/XPathHelper.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite
index d8105b7465..d8105b7465 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/catalog.composite
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl
index 55514fff7a..55514fff7a 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/AWSECommerceService.wsdl
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl
index 0a4871ca88..0a4871ca88 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/src/main/resources/wsdl/ShoppingService.wsdl
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
index 5e30575949..5e30575949 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/pom.xml
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java
index c46845722c..c46845722c 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/launch/LaunchCatalog.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
index b45e5efccb..b45e5efccb 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
index f8149bbe8d..f8149bbe8d 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
index c4b1800a3d..c4b1800a3d 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java
index a4dc2e67e6..a4dc2e67e6 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/util/CreateDB.java
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite
index aea8a6972c..aea8a6972c 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/src/main/resources/store-catalog-database.composite
diff --git a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql
index 904fab3ce3..904fab3ce3 100644
--- a/java/sca-contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/catalog-amazon/store-db/store.sql
diff --git a/java/sca-contrib/tutorials/store/www-services/pom.xml b/sca-java-2.x/contrib/tutorials/store/www-services/pom.xml
index fd02e3b29b..fd02e3b29b 100644
--- a/java/sca-contrib/tutorials/store/www-services/pom.xml
+++ b/sca-java-2.x/contrib/tutorials/store/www-services/pom.xml
diff --git a/java/sca-contrib/vtest/assembly/component/pom.xml b/sca-java-2.x/contrib/vtest/assembly/component/pom.xml
index b2eac429c1..b2eac429c1 100644
--- a/java/sca-contrib/vtest/assembly/component/pom.xml
+++ b/sca-java-2.x/contrib/vtest/assembly/component/pom.xml
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
index ff17a71a3d..ff17a71a3d 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
index e57ed2f951..e57ed2f951 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
index b2b420ed6a..b2b420ed6a 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/component.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/component.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 6f02d7e941..6f02d7e941 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/java/sca-contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/java/sca-contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-2.x/contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index 0938708b91..0938708b91 100644
--- a/java/sca-contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-2.x/contrib/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/java/sca-contrib/vtest/assembly/composite/pom.xml b/sca-java-2.x/contrib/vtest/assembly/composite/pom.xml
index f9922f4cac..f9922f4cac 100644
--- a/java/sca-contrib/vtest/assembly/composite/pom.xml
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/pom.xml
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
index a5cff3972b..a5cff3972b 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
index 39d879e745..39d879e745 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
index dd80c4dc6a..dd80c4dc6a 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
index 4a4aa965ce..4a4aa965ce 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
index c71e2bcc16..c71e2bcc16 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
index 2f091a8ef2..2f091a8ef2 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/resources/composite.composite
index d533cb8dcf..d533cb8dcf 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/main/resources/composite.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/java/sca-contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/sca-java-2.x/contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
index 03f44e449c..03f44e449c 100644
--- a/java/sca-contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
+++ b/sca-java-2.x/contrib/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/pom.xml b/sca-java-2.x/contrib/vtest/assembly/ctypefile/pom.xml
index 1eac774ff3..1eac774ff3 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/pom.xml
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
index 919e5c2953..919e5c2953 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
index fd32cb1f9b..fd32cb1f9b 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
index 173203ae21..173203ae21 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index c6a0f274c4..c6a0f274c4 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 889bb846ba..889bb846ba 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/java/sca-contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index f8f7e45f61..f8f7e45f61 100644
--- a/java/sca-contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-2.x/contrib/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/java/sca-contrib/vtest/assembly/pom.xml b/sca-java-2.x/contrib/vtest/assembly/pom.xml
index 49e33352b4..49e33352b4 100644
--- a/java/sca-contrib/vtest/assembly/pom.xml
+++ b/sca-java-2.x/contrib/vtest/assembly/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/pom.xml
index b9fa0ff9b9..b9fa0ff9b9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
index bc7212f70c..bc7212f70c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
index 76c857126a..76c857126a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
index 23791f2ca9..23791f2ca9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
index b8e346681c..b8e346681c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
index 75bac4bf18..75bac4bf18 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
index 860d60b0de..860d60b0de 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
index 4c2de35d52..4c2de35d52 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
index c00d5f1c10..c00d5f1c10 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/pom.xml
index 0c0236b440..0c0236b440 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
index a3f1f11826..a3f1f11826 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
index 7290c31f1a..7290c31f1a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
index d38ca0276c..d38ca0276c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
index 5db8768398..5db8768398 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
index a0a654920d..a0a654920d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
index 2f711be74d..2f711be74d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
index f9aa1de8bd..f9aa1de8bd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
index cc1c0d18fd..cc1c0d18fd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
index 3820240ee2..3820240ee2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
index 75573b838d..75573b838d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
index 8349e775c5..8349e775c5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
index 9d5aec8ed5..9d5aec8ed5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
index 49391b3353..49391b3353 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
index d3573176a3..d3573176a3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
index c10369c9bd..c10369c9bd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
index 952194430e..952194430e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
index 4ebd667a00..4ebd667a00 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/pom.xml
index d0e306867f..d0e306867f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
index 636e7fd8fc..636e7fd8fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
index e790c9e6d2..e790c9e6d2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
index 1d874007b2..1d874007b2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
index bf4b0736ca..bf4b0736ca 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
index a320e6b3ff..a320e6b3ff 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
index 4c77104866..4c77104866 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
index b03a0defe5..b03a0defe5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
index 93aafdd971..93aafdd971 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
index eb8f6e59ca..eb8f6e59ca 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
index 296a386876..296a386876 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
index 4373bc2558..4373bc2558 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index 72834a6803..72834a6803 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/pom.xml
index 9c763a1111..9c763a1111 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
index 13bcb1fd51..13bcb1fd51 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
index 01d3ef051e..01d3ef051e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
index 606020cf85..606020cf85 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
index 56644c6967..56644c6967 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
index cbc13e380c..cbc13e380c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
index 61d7e25187..61d7e25187 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/init/pom.xml
index 9700b6870c..9700b6870c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
index 9f6b9bcffd..9f6b9bcffd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
index c48b2e2070..c48b2e2070 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
index 532b1d16eb..532b1d16eb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
index b69a2541b0..b69a2541b0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
index 76f905cff0..76f905cff0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
index 14c0e9c2da..14c0e9c2da 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
index 01b8e101e0..01b8e101e0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
index 4ae38d44b6..4ae38d44b6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
index 6bc3d8e7fc..6bc3d8e7fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
index 7ade16e6d3..7ade16e6d3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
index 35f13a2ae6..35f13a2ae6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 6ee7b8de89..6ee7b8de89 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/pom.xml
index 99f1420712..99f1420712 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
index b68cd53167..b68cd53167 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
index 1cb4f3adf5..1cb4f3adf5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
index d95ea22456..d95ea22456 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
index 4f63a23429..4f63a23429 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
index 47a7a98c7d..47a7a98c7d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
index f2fb8d0dc8..f2fb8d0dc8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/pom.xml
index 402ea03f7a..402ea03f7a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/property/pom.xml
index 0c36e98879..0c36e98879 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
index 5cfea1b099..5cfea1b099 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
index 5ddc59f8b6..5ddc59f8b6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
index c39d4e2504..c39d4e2504 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
index 5de3b5fcff..5de3b5fcff 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
index f30c4c69fc..f30c4c69fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
index 6dd91b598d..6dd91b598d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
index b6d51ef253..b6d51ef253 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
index d6a36f54a9..d6a36f54a9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
index ace9da2904..ace9da2904 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
index 4396b6ce32..4396b6ce32 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
index cd459f2dd1..cd459f2dd1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
index c22ee08f95..c22ee08f95 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
index 02892ca7f3..02892ca7f3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
index ed2c3dc365..ed2c3dc365 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
index f7af170f33..f7af170f33 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
index d5fbc568f7..d5fbc568f7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/pom.xml
index 5e88742f3e..5e88742f3e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
index b28704a3b4..b28704a3b4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
index 04c0bc377e..04c0bc377e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
index 60e2b2408c..60e2b2408c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
index 20fccf807f..20fccf807f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
index c7fc91e65f..c7fc91e65f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
index b4ad1e77d5..b4ad1e77d5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
index 1fe50b4ea7..1fe50b4ea7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/pom.xml
index 8a905a7ebc..8a905a7ebc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
index b7cf3fba71..b7cf3fba71 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
index 7da9d29424..7da9d29424 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
index 208c6a78b0..208c6a78b0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
index f9b87ad251..f9b87ad251 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
index 0e4ed9c18d..0e4ed9c18d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
index 566dc93e6d..566dc93e6d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
index 714b3ce8f4..714b3ce8f4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
index 88cf95b593..88cf95b593 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
index ea974100ab..ea974100ab 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
index 454009da12..454009da12 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
index 2910b1c81c..2910b1c81c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
index 81d0692d7a..81d0692d7a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
index 3493a88206..3493a88206 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
index 982568b236..982568b236 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
index f7a57941dc..f7a57941dc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
index 29d6284c43..29d6284c43 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
index 037d900176..037d900176 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
index d5f1326086..d5f1326086 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
index e2bfa3c45a..e2bfa3c45a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
index 28b8bd84b9..28b8bd84b9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
index 404f329201..404f329201 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
index 66d14c2e96..66d14c2e96 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
index 80546f677c..80546f677c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
index 022a9d11f6..022a9d11f6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
index 196cd6f39a..196cd6f39a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
index acc7d8ca9e..acc7d8ca9e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
index b9d799331f..b9d799331f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
index 60178ba2a3..60178ba2a3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
index 7c195b2b5d..7c195b2b5d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
index 6d65416ce8..6d65416ce8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/service/pom.xml
index 4c018607d1..4c018607d1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
index 7b89b31d7f..7b89b31d7f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
index 26bcf3b9db..26bcf3b9db 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
index 4f4f1e80c7..4f4f1e80c7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
index ffabb3619c..ffabb3619c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
index 83d7980dbc..83d7980dbc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
index a416e33de7..a416e33de7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
index ad44d2b93a..ad44d2b93a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
index 52886131a1..52886131a1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
index bd1a3a5fe6..bd1a3a5fe6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
index 0f8c7dabcb..0f8c7dabcb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
index 6a80e3023e..6a80e3023e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
index cdeb43c4f4..cdeb43c4f4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
index 0ab2e29194..0ab2e29194 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
index b9617e5780..b9617e5780 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
index 474ca084d6..474ca084d6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
index 3fc23d2f68..3fc23d2f68 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
index 5b3c73ddd8..5b3c73ddd8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
index 321d019932..321d019932 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
index f28fa0c3a7..f28fa0c3a7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
index 79051eea8f..79051eea8f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
index 161cbaa620..161cbaa620 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
index 02e67b645b..02e67b645b 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
index ea08149eaf..ea08149eaf 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
index 0731986df2..0731986df2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
index 52f7821ebb..52f7821ebb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/pom.xml
index fff1689569..fff1689569 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
index a7040f944e..a7040f944e 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
index 707568e507..707568e507 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
index 18fcaee6ee..18fcaee6ee 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
index 70a257d19f..70a257d19f 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
index ea4c71d27a..ea4c71d27a 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
index f997d78bb5..f997d78bb5 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
index 4d0d8338ba..4d0d8338ba 100644
--- a/java/sca-contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/pom.xml
index 0a2d12a41e..0a2d12a41e 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
index b2c8c07866..b2c8c07866 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
index 7e425c740f..7e425c740f 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
index d7799bb3aa..d7799bb3aa 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
index d0da012f6f..d0da012f6f 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
index 079d859f74..079d859f74 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
index 06a71c29ac..06a71c29ac 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
index e508687965..e508687965 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
index 157864fd27..157864fd27 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
index 9432c70ff3..9432c70ff3 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
index 19f110d5dc..19f110d5dc 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
index e9352a5c06..e9352a5c06 100644
--- a/java/sca-contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/pom.xml
index e026dcc800..e026dcc800 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
index 845c10303e..845c10303e 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
index a3148aa0d7..a3148aa0d7 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
index 7160121388..7160121388 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
index c487559ca1..c487559ca1 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
index 87cab2f479..87cab2f479 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
index 9b46ac5e08..9b46ac5e08 100644
--- a/java/sca-contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/exception/pom.xml
index ef6e5182ee..ef6e5182ee 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
index 90582e88a2..90582e88a2 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
index c1c1c6544c..c1c1c6544c 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
index 11886277ad..11886277ad 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
index 466a32731a..466a32731a 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
index c0aed7a707..c0aed7a707 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
index 82873ed96d..82873ed96d 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
index 1190e6900f..1190e6900f 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
index eca4b54109..eca4b54109 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
index 57a34716e6..57a34716e6 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
index c1f5a56a9a..c1f5a56a9a 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite
index 5bd933ce96..5bd933ce96 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/main/resources/exception.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
index da7b1da0fa..da7b1da0fa 100644
--- a/java/sca-contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/pom.xml
index 164c67ebbb..164c67ebbb 100644
--- a/java/sca-contrib/vtest/java-api/apis/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/pom.xml
index d849fad4fe..d849fad4fe 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
index 6fec5cada3..6fec5cada3 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
index 4dd2088f90..4dd2088f90 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
index d913e95a53..d913e95a53 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
index 5d3cbf6e3d..5d3cbf6e3d 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
index d358736daa..d358736daa 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
index 4aa5eeb25a..4aa5eeb25a 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
index e3b761bd37..e3b761bd37 100644
--- a/java/sca-contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/pom.xml b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/pom.xml
index 1ad6a9c2ec..1ad6a9c2ec 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
index 6de5d6810e..6de5d6810e 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
index f8c5c1272f..f8c5c1272f 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
index 65a444d100..65a444d100 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
index 28c90e2071..28c90e2071 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
index 86dc80a4e1..86dc80a4e1 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
index c5af80291e..c5af80291e 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
index 563d3ceab6..563d3ceab6 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
index ba3edf13ae..ba3edf13ae 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
index 9bded61947..9bded61947 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
diff --git a/java/sca-contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
index fda917d60a..fda917d60a 100644
--- a/java/sca-contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/pom.xml b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/pom.xml
index 656ee9c3cd..656ee9c3cd 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
index e78736d4df..e78736d4df 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
index f4271d0d92..f4271d0d92 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
index d7ecbb7427..d7ecbb7427 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
index be7ea97eac..be7ea97eac 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
index 19a8b86f28..19a8b86f28 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
index 15672f9ee0..15672f9ee0 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
index 31479f1848..31479f1848 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
index b6359f348b..b6359f348b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
index 9e8b64e3b9..9e8b64e3b9 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
index acf262512e..acf262512e 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
index b1439770da..b1439770da 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
index dae4152333..dae4152333 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
index d1a30fd305..d1a30fd305 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
index 7732b3865f..7732b3865f 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
index 9bda00413b..9bda00413b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
index 1bbc1fa4eb..1bbc1fa4eb 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
index 6a66e73569..6a66e73569 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
index 24dbad3d4a..24dbad3d4a 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
index b9785fa657..b9785fa657 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
index dc546a81a0..dc546a81a0 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
index 01260c67f1..01260c67f1 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
index 78dfe7221f..78dfe7221f 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
index 6120b815d5..6120b815d5 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
index 50feee41d6..50feee41d6 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
index 67dd77ce7b..67dd77ce7b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
index fd19c8d7b1..fd19c8d7b1 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
index c3b2e04ff2..c3b2e04ff2 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
index 0298b39825..0298b39825 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
index 4374306609..4374306609 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
index d487c94fd3..d487c94fd3 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
index 164397bf6b..164397bf6b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
index d71c89d565..d71c89d565 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
index 5dcaf9c06f..5dcaf9c06f 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
index 4b2ee3a838..4b2ee3a838 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
index 88059ccb45..88059ccb45 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
index 691dc80632..691dc80632 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
index 7c691efa8d..7c691efa8d 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
index 272484a6f0..272484a6f0 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
index d9c4866466..d9c4866466 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
index 1c2d20ff94..1c2d20ff94 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
index 5dd429077d..5dd429077d 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
index b263eb869b..b263eb869b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
index 4f08ac7a1b..4f08ac7a1b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
index 11c896a06d..11c896a06d 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
index 00984ae565..00984ae565 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
index 802c9c30db..802c9c30db 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
index e66ea5d537..e66ea5d537 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
index 4d93d2279d..4d93d2279d 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
index cd8c589a59..cd8c589a59 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
index d2d9956103..d2d9956103 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
index 6c69330ce5..6c69330ce5 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
index 72c08e8344..72c08e8344 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
index 144f7f3d00..144f7f3d00 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
index ace06b245c..ace06b245c 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite
index 4623f17ca2..4623f17ca2 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/main/resources/callback.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
index 2680370c5b..2680370c5b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/pom.xml b/sca-java-2.x/contrib/vtest/java-api/conversation/id/pom.xml
index 68bfdc7fe1..68bfdc7fe1 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
index 39719539ba..39719539ba 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
index b5911101b8..b5911101b8 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
index 1730f863b5..1730f863b5 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
index ac40c56ee6..ac40c56ee6 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
index bac842dfca..bac842dfca 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
index 3c4eea4bc9..3c4eea4bc9 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
index 1e5a459954..1e5a459954 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
index 25e7154fca..25e7154fca 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
index d3cb107a61..d3cb107a61 100644
--- a/java/sca-contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/pom.xml
index 1d4a2d3c4e..1d4a2d3c4e 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
index f5249b3a5b..f5249b3a5b 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
index 635e6e74d4..635e6e74d4 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
index b28a31da38..b28a31da38 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
index ab186ee7eb..ab186ee7eb 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
index 020d18b862..020d18b862 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
index c339ebd6ea..c339ebd6ea 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
index 18d592f9d0..18d592f9d0 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
index 71e09c38b3..71e09c38b3 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
index e182613932..e182613932 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
index 15a4ab3b76..15a4ab3b76 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
index 21ee8acac1..21ee8acac1 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
index 52c11b881c..52c11b881c 100644
--- a/java/sca-contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/pom.xml b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/pom.xml
index dba54f0f4c..dba54f0f4c 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
index bd19b504d9..bd19b504d9 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
index c404b91673..c404b91673 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
index d9f32dcfea..d9f32dcfea 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
index 920d1294b3..920d1294b3 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
index 98cf59c084..98cf59c084 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
index 5f223dfcf0..5f223dfcf0 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
index a8500dfb09..a8500dfb09 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
diff --git a/java/sca-contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
index 929fe06115..929fe06115 100644
--- a/java/sca-contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/conversation/pom.xml b/sca-java-2.x/contrib/vtest/java-api/conversation/pom.xml
index 08fa85c79d..08fa85c79d 100644
--- a/java/sca-contrib/vtest/java-api/conversation/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/conversation/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/pom.xml b/sca-java-2.x/contrib/vtest/java-api/pom.xml
index 9b5e957b6e..9b5e957b6e 100644
--- a/java/sca-contrib/vtest/java-api/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/pom.xml
diff --git a/java/sca-contrib/vtest/pom.xml b/sca-java-2.x/contrib/vtest/pom.xml
index a49648244b..a49648244b 100644
--- a/java/sca-contrib/vtest/pom.xml
+++ b/sca-java-2.x/contrib/vtest/pom.xml
diff --git a/java/sca-contrib/vtest/processcomments.rb b/sca-java-2.x/contrib/vtest/processcomments.rb
index b7a7fc1cc3..b7a7fc1cc3 100644
--- a/java/sca-contrib/vtest/processcomments.rb
+++ b/sca-java-2.x/contrib/vtest/processcomments.rb
diff --git a/java/sca-contrib/vtest/utilities/pom.xml b/sca-java-2.x/contrib/vtest/utilities/pom.xml
index c4647ef2c0..c4647ef2c0 100644
--- a/java/sca-contrib/vtest/utilities/pom.xml
+++ b/sca-java-2.x/contrib/vtest/utilities/pom.xml
diff --git a/java/sca-contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/sca-java-2.x/contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
index 9b6792e51b..9b6792e51b 100644
--- a/java/sca-contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
+++ b/sca-java-2.x/contrib/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
index 93281db150..93281db150 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
index b99ced1e17..b99ced1e17 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
index 77c7bd4071..77c7bd4071 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
index b1979b99d9..b1979b99d9 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
index 9a99700550..9a99700550 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
index 862dd78735..862dd78735 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
index 225476ada0..225476ada0 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
index 9c5908f34e..9c5908f34e 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
index 9bda9468f5..9bda9468f5 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
index 39d66fa365..39d66fa365 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
index b50774cfa9..b50774cfa9 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
index 56356ce487..56356ce487 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
index 1edeea95a3..1edeea95a3 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
index 007ff62f17..007ff62f17 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
index 63049ac3df..63049ac3df 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
index 1a8d4671aa..1a8d4671aa 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
index abed24390e..abed24390e 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
index aba7748bb0..aba7748bb0 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
index c7bf86e5eb..c7bf86e5eb 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
index 9f6ff73355..9f6ff73355 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
index 8cd599354a..8cd599354a 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
index ae058cf6c9..ae058cf6c9 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
index 5dbb696bf5..5dbb696bf5 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/pom.xml
index e40a4270c7..e40a4270c7 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/pom.xml
index 63dc9ad5f6..63dc9ad5f6 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
index d786f36db1..d786f36db1 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
index d4ebfcfe37..d4ebfcfe37 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
index 7289714ed2..7289714ed2 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
index e0c58088da..e0c58088da 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
index e279b1d55d..e279b1d55d 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
index 9aaba29629..9aaba29629 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
index 35291dc402..35291dc402 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
index 0bc776b06d..0bc776b06d 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
index 8ebf27bdb1..8ebf27bdb1 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
index 22247f8372..22247f8372 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
index 4fbc82227c..4fbc82227c 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
index 83f6746a5f..83f6746a5f 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
index ec6611fae4..ec6611fae4 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
index 4b488c376e..4b488c376e 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
index f79df5bf8f..f79df5bf8f 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
index ae7dafa46e..ae7dafa46e 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
index a4744b9007..a4744b9007 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml
index 1334e35880..1334e35880 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
index e78c977ef0..e78c977ef0 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
index 1d95f089c9..1d95f089c9 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
index 45d10bbd45..45d10bbd45 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
index f55e23012f..f55e23012f 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
index 91c9860b98..91c9860b98 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
index 99d4f7b09f..99d4f7b09f 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
index e95fae6877..e95fae6877 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
index a313b769e5..a313b769e5 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
index 3baf691d88..3baf691d88 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
index 965e195ae3..965e195ae3 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
index 69e7edcc68..69e7edcc68 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
index 7e8294f778..7e8294f778 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
index 7909edeb39..7909edeb39 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
index 2f34bf08f9..2f34bf08f9 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
index 61a658ab55..61a658ab55 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
index edd0d91072..edd0d91072 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
index 896b5a3d89..896b5a3d89 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
index c65f7e8e52..c65f7e8e52 100644
--- a/java/sca-contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/pom.xml
index 786fc89731..786fc89731 100644
--- a/java/sca-contrib/vtest/wsbinding/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/service/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/service/pom.xml
index 4fb8d98b57..4fb8d98b57 100644
--- a/java/sca-contrib/vtest/wsbinding/service/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
index bdb5aa3821..bdb5aa3821 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
index 2dc7afce0c..2dc7afce0c 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
index 93cd716abe..93cd716abe 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
index 6ab7668c8b..6ab7668c8b 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl
index e7953eb2b4..e7953eb2b4 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/aservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
index 0d92174442..0d92174442 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite
index 3ba152b7b8..3ba152b7b8 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/endpointreference.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
index 85c604070a..85c604070a 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
index 0c11c79efe..0c11c79efe 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite
index 859b93bec4..859b93bec4 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlport.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
index fa96e650de..fa96e650de 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
index d858daaf78..d858daaf78 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
index 49f9db248f..49f9db248f 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
index 292de8b654..292de8b654 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
index 842da87bd4..842da87bd4 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
index 0545cef776..0545cef776 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
index aa2b2fac7a..aa2b2fac7a 100644
--- a/java/sca-contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/pom.xml
index 648aa920e8..648aa920e8 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
index 2f6db92318..2f6db92318 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
index a040adb113..a040adb113 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
index 3195263584..3195263584 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
index aed5abebf4..aed5abebf4 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
index 3386ea709f..3386ea709f 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
index 853cc74d4e..853cc74d4e 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
index 43051d6f10..43051d6f10 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
index 5496362e34..5496362e34 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
index 63753d4ba7..63753d4ba7 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
index 0a268ff447..0a268ff447 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
index 8ce0fbaeb8..8ce0fbaeb8 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
index ff151faa7a..ff151faa7a 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
index 6b97b5e602..6b97b5e602 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
index f30cf38654..f30cf38654 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/pom.xml
index 13b0f4ea8c..13b0f4ea8c 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/pom.xml
index e47ca9c9da..e47ca9c9da 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
index 6fa9906d45..6fa9906d45 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
index 978d515f92..978d515f92 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
index 766139ee92..766139ee92 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
index ee9ca25a4b..ee9ca25a4b 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
index 80d998d1a6..80d998d1a6 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
index bec82776bf..bec82776bf 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
index b379a2e3ef..b379a2e3ef 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
index 069308a520..069308a520 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
index 7ad9e3066c..7ad9e3066c 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
index 58ae1e9577..58ae1e9577 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
index d5c8d72dc1..d5c8d72dc1 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
index 8a715a2081..8a715a2081 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
index 5b9b77683e..5b9b77683e 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
index 0db579002b..0db579002b 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/pom.xml b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/pom.xml
index 39f2c45921..39f2c45921 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/pom.xml
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/pom.xml
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
index 464a834570..464a834570 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
index 37ccee6cd4..37ccee6cd4 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
index c8355f8f1b..c8355f8f1b 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
index d3f5ab1c47..d3f5ab1c47 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
index 1a64706a29..1a64706a29 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
index 986027c08a..986027c08a 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
index a58297de69..a58297de69 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
index 3ecbc95901..3ecbc95901 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
index 05af362a25..05af362a25 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
index dadbb63873..dadbb63873 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
index 521f077c46..521f077c46 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
index bdf294b473..bdf294b473 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
index 9801ecd037..9801ecd037 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
diff --git a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
index 22d2a80244..22d2a80244 100644
--- a/java/sca-contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
+++ b/sca-java-2.x/contrib/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java